diff --git a/README.md b/README.md index e64b485c..5835a05b 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ Web interface(user-friendly web GUI, alerting, monitoring and secure) for managing HAProxy, Nginx and Keepalived servers. Leave your [feedback](https://github.com/hap-wi/roxy-wi/issues) # Get involved -* [Youtube Demo video](https://www.youtube.com/channel/UCo0lCg24j-H4f0S9kMjp-_w) -* [Twitter](https://twitter.com/roxy_wi), subscribe! * [Telegram Channel](https://t.me/roxy_wi_channel) about Roxy-WI, talks and questions are welcome # Demo site @@ -12,17 +10,17 @@ Web interface(user-friendly web GUI, alerting, monitoring and secure) for managi ![alt text](https://roxy-wi.org/static/images/viewstat.png "HAProxy state page") # Features: -1. Installing and updating HAProxy, Nginx and Keepalived with Roxy-WI as a system service +1. Installing and updating HAProxy, Nginx, Apache and Keepalived with Roxy-WI as a system service 2. Installing and updating HAProxy and Nginx with Roxy-WI as a Docker service 3. Installing and updating Grafana, Prometheus servers with Roxy-WI -4. Installing and updating HAProxy and Nginx exporters with Roxy-WI +4. Installing and updating HAProxy, Nginx, Apache, Keepalived and Node exporters with Roxy-WI 5. Server provisioning on AWS, DigitalOcean and G-Core Labs 6. Downloading, updating and formatting GeoIP to the acceptable format for HAProxy with Roxy-WI 7. Dynamic change of Maxconn, Black/white lists and backend's IP address and port with saving changes to the config file 8. Configuring HAProxy, Nginx, Apache and Keepalived in a jiffy with Roxy-WI 9. Viewing and analysing the status of all Frontend/backend servers via Roxy-WI from a single control panel 10. Enabling/disabling servers through stats page without rebooting HAProxy -11. Viewing/Analysing HAProxy, Nginx and Apache logs right from the Roxy-WI web interface +11. Viewing/Analysing HAProxy, Nginx, Apache and Keepalived logs right from the Roxy-WI web interface 12. Creating and visualizing the HAProxy workflow from Web Ui 13. Pushing Your changes to your HAProxy, Nginx, Apache and Keepalived servers with a single click via the web interface 14. Getting info on past changes, evaluating your config files and restoring the previous stable config at any time with a single click right from Web interface @@ -32,8 +30,8 @@ Web interface(user-friendly web GUI, alerting, monitoring and secure) for managi 18. Managing the ports assigned to Frontend automatically 19. Evaluating the changes of recent configs pushed to HAProxy, Nginx, Apache and Keepalived instances right from the Web UI 20. Multiple User Roles support for privileged based Viewing and editing of Config -21. Creating Groups and adding/removing servers to ensure the proper identification for your HAProxy and Nginx Clusters -22. Sending notifications from Roxy-WI via Telegram, Slack, Email and via the web interface +21. Creating Groups and adding/removing servers to ensure the proper identification for your HAProxy, Nginx and Apache Clusters +22. Sending notifications from Roxy-WI via Telegram, Slack, Email, PageDuty and via the web interface 23. Supporting high Availability to ensure uptime to all Master slave servers configured 24. Support of SSL (including Let's Encrypt) 25. Support of SSH Key for managing multiple HAProxy, Nginx, Apache and Keepalived Servers straight from Roxy-WI @@ -47,7 +45,7 @@ Web interface(user-friendly web GUI, alerting, monitoring and secure) for managi 33. Keep active HAProxy, Nginx, Apache and Keepalived services 34. Possibility to hide parts of the config with tags for users with "guest" role: "HideBlockStart" and "HideBlockEnd" 35. Mobile-ready design -36. Simple port monitoring (SMON) +36. [SMON](https://roxy-wi.org/services/smon) (Check: Ping, TCP/UDP, HTTP(s), SSL expiry, HTTP body answer, DNS records) 37. Backup HAProxy, Nginx, Apache and Keepalived config files through Roxy-WI 38. Managing OpenVPN3 as a client via Roxy-WI @@ -108,7 +106,7 @@ Login https://roxy-wi-server/users.py, and add: users, groups and servers. Defau If you have error: ``` Forbidden -You don't have permission to access /app/overview.py on this server. +You don't have permission to access /app/overview.py on this server. ``` Check owner(must be apache, or another user for apache) @@ -123,7 +121,7 @@ Do this: $ cd /var/www/haproxy-wi/app $ ./create_db.py ``` -and check executable py files +and check executable .py files If you see plain text, check section "Directory" in httpd conf diff --git a/app/create_db.py b/app/create_db.py index 8f50ff97..603cc4ce 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -19,9 +19,6 @@ def default_values(): 'The directory must be owned by the user specified in SSH settings', 'group': '1'}, {'param': 'cert_path', 'value': '/etc/ssl/certs/', 'section': 'main', 'desc': 'Path to SSL dir. Folder owner must be a user which set in the SSH settings. Path must exist', 'group': '1'}, - {'param': 'ssl_local_path', 'value': 'certs', 'section': 'main', - 'desc': 'Path to the directory with the saved local SSL certificates. The value of this parameter is ' - 'specified as a relative path beginning with $HOME_ROXY_WI/app/', 'group': '1'}, {'param': 'maxmind_key', 'value': '', 'section': 'main', 'desc': 'License key for downloading GeoIP DB. You can create it on maxmind.com', 'group': '1'}, {'param': 'haproxy_path_logs', 'value': '/var/log/haproxy/', 'section': 'haproxy', 'desc': 'The path for HAProxy logs', 'group': '1'}, {'param': 'syslog_server_enable', 'value': '0', 'section': 'logs', 'desc': 'Enable getting logs from a syslog server', 'group': '1'}, @@ -841,9 +838,18 @@ def update_db_v_6_3_17(): print("Updating... DB has been updated to version 6.3.17") +def update_db_v_6_3_18(): + try: + Setting.delete().where(Setting.param == 'ssl_local_path').execute() + except Exception as e: + print("An error occurred:", e) + else: + print("Updating... DB has been updated to version 6.3.18") + + def update_ver(): try: - Version.update(version='6.3.17.0').execute() + Version.update(version='6.3.18.0').execute() except Exception: print('Cannot update version') @@ -876,6 +882,7 @@ def update_all(): update_db_v_6_3_13_4() update_db_v_6_3_13_5() update_db_v_6_3_17() + update_db_v_6_3_18() update_ver() diff --git a/app/modules/config/add.py b/app/modules/config/add.py index 5acbcc29..3324c493 100644 --- a/app/modules/config/add.py +++ b/app/modules/config/add.py @@ -419,13 +419,9 @@ def del_ssl_cert(server_ip: str, cert_id: str) -> None: def upload_ssl_cert(server_ip: str, ssl_name: str, ssl_cont: str) -> None: - cert_local_dir = f"{os.path.dirname(os.getcwd())}/{sql.get_setting('ssl_local_path')}" cert_path = sql.get_setting('cert_path') name = '' - if not os.path.exists(cert_local_dir): - os.makedirs(cert_local_dir) - if ssl_name is None: print('error: Please enter a desired name') else: @@ -450,9 +446,9 @@ def upload_ssl_cert(server_ip: str, ssl_name: str, ssl_cont: str) -> None: print(f'success: the SSL file has been uploaded to {server_ip} into: {cert_path}/{name}') except Exception as e: roxywi_common.logging('Roxy-WI server', e.args[0], roxywi=1) - try: - os.rename(name, cert_local_dir) - except OSError as e: - roxywi_common.logging('Roxy-WI server', e.args[0], roxywi=1) + # try: + # os.rename(name, cert_local_dir) + # except OSError as e: + # roxywi_common.logging('Roxy-WI server', e.args[0], roxywi=1) roxywi_common.logging(server_ip, f"add.py#ssl uploaded a new SSL cert {name}", roxywi=1, login=1) diff --git a/app/modules/db/db_model.py b/app/modules/db/db_model.py index 3ad80665..01324df6 100644 --- a/app/modules/db/db_model.py +++ b/app/modules/db/db_model.py @@ -209,6 +209,20 @@ class Backup(BaseModel): table_name = 'backups' +class S3Backup(BaseModel): + id = AutoField() + server = CharField() + s3_server = CharField() + bucket = CharField() + secret_key = CharField() + access_key = CharField() + time = CharField() + description = CharField(null=True) + + class Meta: + table_name = 's3_backups' + + class Metrics(BaseModel): serv = CharField() curr_con = IntegerField() @@ -669,4 +683,4 @@ def create_tables(): ProvisionedServers, MetricsHttpStatus, SMON, WafRules, Alerts, GeoipCodes, NginxMetrics, SystemInfo, Services, UserName, GitSetting, CheckerSetting, ApacheMetrics, ProvisionParam, WafNginx, ServiceStatus, KeepaliveRestart, PD, SmonHistory, SmonTcpCheck, SmonHttpCheck, - SmonPingCheck, SmonDnsCheck]) + SmonPingCheck, SmonDnsCheck, S3Backup]) diff --git a/app/modules/db/sql.py b/app/modules/db/sql.py index 244fc9a2..2b671704 100755 --- a/app/modules/db/sql.py +++ b/app/modules/db/sql.py @@ -26,7 +26,7 @@ def get_setting(param, **kwargs): except Exception: pass - if user_group == '' or param in ('ssl_local_path', 'proxy'): + if user_group == '' or param in ('proxy'): user_group = 1 if kwargs.get('all'): @@ -1019,6 +1019,19 @@ def insert_backup_job(server, rserver, rpath, backup_type, time, cred, descripti return True +def insert_s3_backup_job(server, s3_server, bucket, secret_key, access_key, time, description): + try: + S3Backup.insert( + server=server, s3_server=s3_server, bucket=bucket, secret_key=secret_key, access_key=access_key, time=time, + description=description + ).execute() + except Exception as e: + out_error(e) + return False + else: + return True + + def select_backups(**kwargs): if kwargs.get("server") is not None and kwargs.get("rserver") is not None: query = Backup.select().where((Backup.server == kwargs.get("server")) & (Backup.rhost == kwargs.get("rserver"))) @@ -1033,6 +1046,24 @@ def select_backups(**kwargs): return query_res +def select_s3_backups(**kwargs): + if kwargs.get("server") is not None and kwargs.get("bucket") is not None: + query = S3Backup.select().where( + (S3Backup.server == kwargs.get("server")) & + (S3Backup.s3_server == kwargs.get("s3_server")) & + (S3Backup.bucket == kwargs.get("bucket")) + ) + else: + query = S3Backup.select().order_by(S3Backup.id) + + try: + query_res = query.execute() + except Exception as e: + out_error(e) + else: + return query_res + + def update_backup(server, rserver, rpath, backup_type, time, cred, description, backup_id): backup_update = Backup.update( server=server, rhost=rserver, rpath=rpath, backup_type=backup_type, time=time, @@ -1058,6 +1089,17 @@ def delete_backups(backup_id: int) -> bool: return True +def delete_s3_backups(backup_id: int) -> bool: + query = S3Backup.delete().where(S3Backup.id == backup_id) + try: + query.execute() + except Exception as e: + out_error(e) + return False + else: + return True + + def check_exists_backup(server: str) -> bool: try: backup = Backup.get(Backup.server == server) @@ -1070,9 +1112,9 @@ def check_exists_backup(server: str) -> bool: return False -def check_exists_s3_backup(server_id: int) -> bool: +def check_exists_s3_backup(server: str) -> bool: try: - backup = S3Backup.get(S3Backup.server_id == server_id) + backup = S3Backup.get(S3Backup.server == server) except Exception: pass else: diff --git a/app/modules/server/server.py b/app/modules/server/server.py index 549933ab..b23bd326 100644 --- a/app/modules/server/server.py +++ b/app/modules/server/server.py @@ -492,10 +492,10 @@ def delete_server(server_id: int) -> None: server_ip = s[2] if sql.check_exists_backup(server_ip): - print('warning: Delete the backup first ') + print('warning: Delete the backup first') return - if sql.check_exists_s3_backup(server_id): - print('warning: Delete the S3 backup first ') + if sql.check_exists_s3_backup(server_ip): + print('warning: Delete the S3 backup first') return if sql.delete_server(server_id): sql.delete_waf_server(server_id) diff --git a/app/modules/service/backup.py b/app/modules/service/backup.py index 33fe6f17..0bca4f43 100644 --- a/app/modules/service/backup.py +++ b/app/modules/service/backup.py @@ -6,6 +6,7 @@ import modules.db.sql as sql import modules.server.ssh as ssh_mod import modules.server.server as server_mod import modules.roxywi.common as roxywi_common +import modules.service.installation as installation_mod def backup(serv, rpath, time, backup_type, rserver, cred, deljob, update, description) -> None: @@ -51,8 +52,7 @@ def backup(serv, rpath, time, backup_type, rserver, cred, deljob, update, descri ) print(template) print('success: Backup job has been created') - roxywi_common.logging('backup ', f' a new backup job for server {serv} has been created', roxywi=1, - login=1) + roxywi_common.logging('backup ', f' a new backup job for server {serv} has been created', roxywi=1, login=1) else: print('error: Cannot add the job into DB') elif deljob: @@ -67,13 +67,104 @@ def backup(serv, rpath, time, backup_type, rserver, cred, deljob, update, descri os.remove(script) -def create_s3_backup() -> None: - ... +def s3_backup(server, s3_server, bucket, secret_key, access_key, time, deljob, description) -> None: + script = 's3_backup.sh' + tag = 'add' + + if deljob: + time = '' + secret_key = '' + access_key = '' + tag = 'delete' + else: + if sql.check_exists_s3_backup(server): + raise Exception(f'error: Backup job for {server} already exists') + + os.system(f"cp scripts/{script} .") + + commands = [ + f"chmod +x {script} && ./{script} SERVER={server} S3_SERVER={s3_server} BUCKET={bucket} SECRET_KEY={secret_key} ACCESS_KEY={access_key} TIME={time} TAG={tag}" + ] + + return_out = server_mod.subprocess_execute_with_rc(commands[0]) + + if not deljob and not update: + try: + if installation_mod.show_installation_output(return_out['error'], return_out['output'], 'S3 backup', rc=return_out['rc'], api=1): + try: + sql.insert_s3_backup_job(server, s3_server, bucket, secret_key, access_key, time, description) + except Exception as e: + raise Exception(f'error: {e}') + except Exception as e: + raise Exception(e) + env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) + template = env.get_template('new_s3_backup.html') + template = template.render(backups=sql.select_s3_backups(server=server, s3_server=s3_server, bucket=bucket)) + print(template) + print('success: Backup job has been created') + roxywi_common.logging('backup ', f' a new S3 backup job for server {server} has been created', roxywi=1, login=1) + elif deljob: + sql.delete_s3_backups(deljob) + print('Ok') + roxywi_common.logging('backup ', f' a S3 backup job for server {server} has been deleted', roxywi=1, login=1) -def delete_s3_backup() -> None: - ... +def git_backup(server_id, service_id, git_init, repo, branch, period, cred, deljob, description) -> None: + servers = roxywi_common.get_dick_permit() + proxy = sql.get_setting('proxy') + services = sql.select_services() + server_ip = sql.select_server_ip_by_id(server_id) + service_name = sql.select_service_name_by_id(service_id).lower() + service_config_dir = sql.get_setting(service_name + '_dir') + script = 'git_backup.sh' + proxy_serv = '' + ssh_settings = ssh_mod.return_ssh_keys_path('localhost', id=int(cred)) + os.system(f"cp scripts/{script} .") -def show_s3_backup(): - ... + if proxy is not None and proxy != '' and proxy != 'None': + proxy_serv = proxy + + if repo is None or git_init == '0': + repo = '' + if branch is None or branch == '0': + branch = 'main' + + commands = [ + f"chmod +x {script} && ./{script} HOST={server_ip} DELJOB={deljob} SERVICE={service_name} INIT={git_init} " + f"SSH_PORT={ssh_settings['port']} PERIOD={period} REPO={repo} BRANCH={branch} CONFIG_DIR={service_config_dir} " + f"PROXY={proxy_serv} USER={ssh_settings['user']} KEY={ssh_settings['key']}" + ] + + output, error = server_mod.subprocess_execute(commands[0]) + + for line in output: + if any(s in line for s in ("Traceback", "FAILED")): + try: + print('error: ' + line) + break + except Exception: + print('error: ' + output) + break + else: + if deljob == '0': + if sql.insert_new_git( + server_id=server_id, service_id=service_id, repo=repo, branch=branch, + period=period, cred=cred, description=description + ): + gits = sql.select_gits(server_id=server_id, service_id=service_id) + sshs = sql.select_ssh() + + lang = roxywi_common.get_user_lang() + env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) + template = env.get_template('new_git.html') + template = template.render(gits=gits, sshs=sshs, servers=servers, services=services, new_add=1, lang=lang) + print(template) + print('success: Git job has been created') + roxywi_common.logging( + server_ip, ' A new git job has been created', roxywi=1, login=1, keep_history=1, service=service_name + ) + else: + if sql.delete_git(form.getvalue('git_backup')): + print('Ok') + os.remove(script) diff --git a/app/options.py b/app/options.py index 1e5a8106..cebbb145 100644 --- a/app/options.py +++ b/app/options.py @@ -450,7 +450,7 @@ if form.getvalue('keepalived_exp_install'): if form.getvalue('backup') or form.getvalue('deljob') or form.getvalue('backupupdate'): import modules.service.backup as backup_mod - serv = common.is_ip_or_dns(form.getvalue('server')) + server = common.is_ip_or_dns(form.getvalue('server')) rpath = common.checkAjaxInput(form.getvalue('rpath')) time = common.checkAjaxInput(form.getvalue('time')) backup_type = common.checkAjaxInput(form.getvalue('type')) @@ -460,10 +460,28 @@ if form.getvalue('backup') or form.getvalue('deljob') or form.getvalue('backupup update = common.checkAjaxInput(form.getvalue('backupupdate')) description = common.checkAjaxInput(form.getvalue('description')) - backup_mod.backup(serv, rpath, time, backup_type, rserver, cred, deljob, update, description) + try: + backup_mod.backup(server, rpath, time, backup_type, rserver, cred, deljob, update, description) + except Exception as e: + print(e) +if any((form.getvalue('s3_backup_server'), form.getvalue('dels3job'))): + import modules.service.backup as backup_mod + + server = common.is_ip_or_dns(form.getvalue('s3_backup_server')) + s3_server = common.checkAjaxInput(form.getvalue('s3_server')) + bucket = common.checkAjaxInput(form.getvalue('s3_bucket')) + secret_key = common.checkAjaxInput(form.getvalue('s3_secret_key')) + access_key = common.checkAjaxInput(form.getvalue('s3_access_key')) + time = common.checkAjaxInput(form.getvalue('time')) + deljob = common.checkAjaxInput(form.getvalue('dels3job')) + description = common.checkAjaxInput(form.getvalue('description')) + + backup_mod.s3_backup(server, s3_server, bucket, secret_key, access_key, time, deljob, description) if form.getvalue('git_backup'): + import modules.service.backup as backup_mod + server_id = form.getvalue('server') service_id = form.getvalue('git_service') git_init = form.getvalue('git_init') @@ -473,64 +491,8 @@ if form.getvalue('git_backup'): cred = form.getvalue('cred') deljob = form.getvalue('git_deljob') description = form.getvalue('description') - servers = roxywi_common.get_dick_permit() - proxy = sql.get_setting('proxy') - services = sql.select_services() - server_ip = sql.select_server_ip_by_id(server_id) - service_name = sql.select_service_name_by_id(service_id).lower() - service_config_dir = sql.get_setting(service_name + '_dir') - script = 'git_backup.sh' - proxy_serv = '' - ssh_settings = ssh_mod.return_ssh_keys_path('localhost', id=int(cred)) - os.system(f"cp scripts/{script} .") - - if proxy is not None and proxy != '' and proxy != 'None': - proxy_serv = proxy - - if repo is None or git_init == '0': - repo = '' - if branch is None or branch == '0': - branch = 'main' - - commands = [ - f"chmod +x {script} && ./{script} HOST={server_ip} DELJOB={deljob} SERVICE={service_name} INIT={git_init} " - f"SSH_PORT={ssh_settings['port']} PERIOD={period} REPO={repo} BRANCH={branch} CONFIG_DIR={service_config_dir} " - f"PROXY={proxy_serv} USER={ssh_settings['user']} KEY={ssh_settings['key']}" - ] - - output, error = server_mod.subprocess_execute(commands[0]) - - for line in output: - if any(s in line for s in ("Traceback", "FAILED")): - try: - print('error: ' + line) - break - except Exception: - print('error: ' + output) - break - else: - if deljob == '0': - if sql.insert_new_git( - server_id=server_id, service_id=service_id, repo=repo, branch=branch, - period=period, cred=cred, description=description - ): - gits = sql.select_gits(server_id=server_id, service_id=service_id) - sshs = sql.select_ssh() - - lang = roxywi_common.get_user_lang() - env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) - template = env.get_template('new_git.html') - template = template.render(gits=gits, sshs=sshs, servers=servers, services=services, new_add=1, lang=lang) - print(template) - print('success: Git job has been created') - roxywi_common.logging( - server_ip, ' A new git job has been created', roxywi=1, login=1, keep_history=1, service=service_name - ) - else: - if sql.delete_git(form.getvalue('git_backup')): - print('Ok') - os.remove(script) + backup_mod.git_backup(server_id, service_id, git_init, repo, branch, period, cred, deljob, description) if form.getvalue('install_service'): server_ip = common.is_ip_or_dns(form.getvalue('install_service')) diff --git a/app/scripts/ansible/roles/s3_backup.yml b/app/scripts/ansible/roles/s3_backup.yml new file mode 100644 index 00000000..f6f6186b --- /dev/null +++ b/app/scripts/ansible/roles/s3_backup.yml @@ -0,0 +1,49 @@ +- hosts: 127.0.0.1 + connection: local + become: yes + become_method: sudo + gather_facts: no + + tasks: + - name: Add S3 Job + tags: add + block: + - name: Install s3cmd + package: + name: s3cmd + state: present + + - name: Find full path to s3cmd + shell: which s3cmd + register: which_s3cmd + + - name: Add keys var + set_fact: keys="--access_key={{ACCESS_KEY}} --secret_key={{SECRET_KEY}} --host={{S3_SERVER}} --host-bucket={{S3_SERVER}}:443" + + - name: Create bucket + shell: "{{ which_s3cmd.stdout }} mb s3://{{ BUCKET }} {{ keys }}" + ignore_errors: true + + - name: Add CRON job + cron: + name: "Roxy-WI S3 Backup configs for server {{ SERVER }} {{ BUCKET }} {{ item }}" + special_time: "{{ TIME }}" + job: "{{ which_s3cmd.stdout }} sync /var/lib/roxy-wi/configs/{{ item }}/{{ SERVER }}*.conf s3://{{ BUCKET }}/{{ SERVER }}/{{ item }}/ {{ keys }}" + with_items: + - kp_config + - hap_config + - nginx_config + - apache_config + + - name: Delete S3 Job + tags: delete + block: + - name: Removes backup jobs + cron: + name: "Roxy-WI S3 Backup configs for server {{ SERVER }} {{ BUCKET }} {{ item }}" + state: absent + with_items: + - kp_config + - hap_config + - nginx_config + - apache_config diff --git a/app/scripts/s3_backup.sh b/app/scripts/s3_backup.sh new file mode 100644 index 00000000..3f80acd2 --- /dev/null +++ b/app/scripts/s3_backup.sh @@ -0,0 +1,34 @@ +#!/bin/bash +for ARGUMENT in "$@" +do + KEY=$(echo $ARGUMENT | cut -f1 -d=) + VALUE=$(echo $ARGUMENT | cut -f2 -d=) + + case "$KEY" in + SERVER) SERVER=${VALUE} ;; + S3_SERVER) S3_SERVER=${VALUE} ;; + BUCKET) BUCKET=${VALUE} ;; + SECRET_KEY) SECRET_KEY=${VALUE} ;; + ACCESS_KEY) ACCESS_KEY=${VALUE} ;; + TAG) TAG=${VALUE} ;; + TIME) TIME=${VALUE} ;; + *) + esac +done + +export ANSIBLE_HOST_KEY_CHECKING=False +export ANSIBLE_DISPLAY_SKIPPED_HOSTS=False +export ACTION_WARNINGS=False +export LOCALHOST_WARNING=False +export COMMAND_WARNINGS=False + +PWD=`pwd` +PWD=$PWD/scripts/ansible/ + +ansible-playbook $PWD/roles/s3_backup.yml -e "SERVER=$SERVER S3_SERVER=$S3_SERVER BUCKET=$BUCKET SECRET_KEY=$SECRET_KEY ACCESS_KEY=$ACCESS_KEY TIME=$TIME" -t $TAG -i $PWD/$HOST + +if [ $? -gt 0 ] +then + echo "error: Cannot create a S3 backup job" + exit 1 +fi diff --git a/app/servers.py b/app/servers.py index 19cbfb13..64e9bb79 100644 --- a/app/servers.py +++ b/app/servers.py @@ -23,19 +23,19 @@ except Exception: sys.exit() roxywi_auth.page_for_admin(level=2) -try: - ldap_enable = sql.get_setting('ldap_enable') - user_group = roxywi_common.get_user_group(id=1) - settings = sql.get_setting('', all=1) - geoip_country_codes = sql.select_geoip_country_codes() - services = sql.select_services() - gits = sql.select_gits() - servers = roxywi_common.get_dick_permit(virt=1, disable=0, only_group=1) - masters = sql.select_servers(get_master_servers=1, uuid=user_params['user_uuid'].value) - is_needed_tool = common.is_tool('ansible') - user_roles = sql.select_user_roles_by_group(user_group) -except Exception: - pass + +ldap_enable = sql.get_setting('ldap_enable') +user_group = roxywi_common.get_user_group(id=1) +settings = sql.get_setting('', all=1) +geoip_country_codes = sql.select_geoip_country_codes() +services = sql.select_services() +gits = sql.select_gits() +servers = roxywi_common.get_dick_permit(virt=1, disable=0, only_group=1) +masters = sql.select_servers(get_master_servers=1, uuid=user_params['user_uuid'].value) +is_needed_tool = common.is_tool('ansible') +user_roles = sql.select_user_roles_by_group(user_group) +backups = sql.select_backups() +s3_backups = sql.select_s3_backups() try: user_subscription = roxywi_common.return_user_status() @@ -52,7 +52,7 @@ rendered_template = template.render( h2=1, title=title, role=user_params['role'], user=user_params['user'], users=sql.select_users(group=user_group), groups=sql.select_groups(), servers=servers, roles=sql.select_roles(), sshs=sql.select_ssh(group=user_group), masters=masters, group=user_group, services=services, timezones=pytz.all_timezones, guide_me=1, - token=user_params['token'], settings=settings, backups=sql.select_backups(), page="servers.py", + token=user_params['token'], settings=settings, backups=backups, s3_backups=s3_backups, page="servers.py", geoip_country_codes=geoip_country_codes, user_services=user_params['user_services'], ldap_enable=ldap_enable, user_status=user_subscription['user_status'], user_plan=user_subscription['user_plan'], gits=gits, is_needed_tool=is_needed_tool, lang=user_params['lang'], user_roles=user_roles diff --git a/app/templates/ajax/new_s3_backup.html b/app/templates/ajax/new_s3_backup.html new file mode 100644 index 00000000..f4fcf54a --- /dev/null +++ b/app/templates/ajax/new_s3_backup.html @@ -0,0 +1,37 @@ +{% for b in backups %} + + + + {{s.1}} + + + {{b.s3_server}} + + + {{b.bucket}} + + + {{b.time}} + + + {% if b.description != 'None' %} + {{b.description}} + {% else %} + + {% endif %} + + + + + + + + + +{% endfor %} diff --git a/app/templates/include/add_s3_backup.html b/app/templates/include/add_s3_backup.html new file mode 100644 index 00000000..3002e26f --- /dev/null +++ b/app/templates/include/add_s3_backup.html @@ -0,0 +1,68 @@ + + + Select a server for backup + * + + + + + + + + Enter a S3 server + * + + + {{ input('s3_server', size='30', required="required") }} + + + + + Enter bucket + * + + + {{ input('s3_bucket', size='30', required="required") }} + + + + + Access key + * + + + {{ input('s3_access_key', size='30', required="required", type='password') }} + + + + + Secret key + * + + + {{ input('s3_secret_key', size='30', required="required", type='password') }} + + + + + Period time + * + + + {% set values = {'hourly':'hourly','daily':'daily','weekly':'weekly', 'monthly':'monthly'} %} + {{ select('s3-backup-time', values=values, selected='weekly', required='required', class='force_close') }} + + + + + Description + + + {{ input('s3-backup-description', size='30') }} + + diff --git a/app/templates/include/admin_backup.html b/app/templates/include/admin_backup.html index 2cd0297c..6bef25c1 100644 --- a/app/templates/include/admin_backup.html +++ b/app/templates/include/admin_backup.html @@ -46,15 +46,15 @@ {% include 'include/no_sub.html' %} {% else %} - + - - - - - - + + + + + + @@ -114,6 +114,58 @@

Filesystem

Remote server
{{lang.words.servers|title()}}{{lang.words.remote|title()}} {{lang.words.server}}{{lang.words.remote|title()}} {{lang.words.folder2}}{{lang.words.backup|title()}} {{lang.words.type}}{{lang.words.period|title()}}{{lang.words.creds|title()}}{{lang.words.desc|title()}}{{lang.words.remote|title()}} {{lang.words.server}}{{lang.words.remote|title()}} {{lang.words.folder2}}{{lang.words.backup|title()}} {{lang.words.type}}{{lang.words.period|title()}}{{lang.words.creds|title()}}{{lang.words.desc|title()}}

+ {{lang.words.add|title()}} {{lang.words.backup}}

+ + + + + + + + + + + + + + + {% for b in s3_backups %} + {% for s in servers %} + {% if b.server in s.2 %} + + + + + + + + + + + + {% endif %} + {% endfor %} + {% endfor %} + +

S3

{{lang.words.servers|title()}}S3 {{lang.words.server}}Bucket{{lang.words.period|title()}}{{lang.words.desc|title()}}
+ + {{s.1}} + + {{b.s3_server}} + + {{b.bucket}} + + {{b.time}} + + {% if b.description != 'None' %} + {{b.description}} + {% else %} + + {% endif %} + + +
+
+ {{lang.words.add|title()}} {{lang.words.backup}} +

{{lang.phrases.read_about_parameters}} {{lang.words.here}} diff --git a/app/templates/include/admins_dialogs.html b/app/templates/include/admins_dialogs.html index f629b803..5d756cbc 100644 --- a/app/templates/include/admins_dialogs.html +++ b/app/templates/include/admins_dialogs.html @@ -291,6 +291,12 @@
+