diff --git a/docker-backup.sh b/docker-backup.sh old mode 100755 new mode 100644 index b2a5055..b120530 --- a/docker-backup.sh +++ b/docker-backup.sh @@ -1,18 +1,13 @@ #!/bin/bash -sudo docker run --rm \ +docker run --rm \ --name volumerize \ -e TZ=Australia/Perth \ -e VOLUMERIZE_SOURCE=/source \ -e VOLUMERIZE_TARGET=file:///backup \ -v backup_docker-cache:/volumerize-cache \ -v backup_docker-volume:/backup \ - -v docker_admin-data:/source/docker_admin-data:ro \ - -v docker_admin-dkim:/source/docker_admin-dkim:ro \ - -v docker_antispam-filter:/source/docker_antispam-filter:ro \ - -v docker_fail2ban-config:/source/docker_fail2ban-config:ro \ - -v docker_front-overrides:/source/docker_front-overrides:ro \ + -v docker_f2ban-config:/source/docker_f2ban-config:ro \ -v docker_ggrav-html:/source/docker_ggrav-html:ro \ - -v docker_imap-mail:/source/docker_imap-mail:ro \ -v docker_nextc-config:/source/docker_nextc-config:ro \ -v docker_nextc-db-config:/source/docker_nextc-db-config:ro \ -v docker_onlyo-ds-font:/source/docker_onlyo-ds-font:ro \ @@ -22,10 +17,6 @@ sudo docker run --rm \ -v docker_onlyo-ds-rb:/source/docker_onlyo-ds-rb:ro \ -v docker_onlyo-ds-rd:/source/docker_onlyo-ds-rd:ro \ -v docker_onlyo-ds-www:/source/docker_onlyo-ds-www:ro \ - -v docker_redis-data:/source/docker_redis-data:ro \ - -v docker_smtp-queue:/source/docker_smtp-queue:ro \ - -v docker_swag-config:/source/docker_swag-config:ro \ - -v docker_webmail-data:/source/docker_webmail-data:ro \ - -v docker_webmail-overrides:/source/docker_webmail-overrides:ro \ + -v docker_swags-config:/source/docker_swags-config:ro \ blacklabelops/volumerize:1.7.1 backup diff --git a/docker-compose.yml b/docker-compose.yml index 0572fcc..f2477a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ networks: - front: + share: external: true local: internal: false @@ -10,39 +10,16 @@ networks: volumes: - fail2ban-config: - swag-config: + swags-config: ggrav-html: nextc-html: nextc-config: nextc-db: nextc-db-config: - onlyo-ds-log: - onlyo-ds-lib: - onlyo-ds-www: - onlyo-ds-pg: - onlyo-ds-rb: - onlyo-ds-rd: - onlyo-ds-font: services: - fail2ban: - image: lscr.io/linuxserver/fail2ban:latest - restart: always - cap_add: - - NET_ADMIN - - NET_RAW - network_mode: host - environment: - - PUID=1000 - - PGID=2000 - - TZ=Australia/Perth - volumes: - - fail2ban-config:/config - - /var/log:/var/log:ro - - swag: + swags: image: andrew/swag:1.31.0 build: context: https://cor.cherished.me/gt/andrew/build-swag.git @@ -62,21 +39,19 @@ services: - EXTRA_DOMAINS= - STAGING=false volumes: - - ${BIND?err}swag-config:/config + - ${BIND?err}swags-config:/config - ${CERT?err}cherished.me.chained.crt:/defaults/custom-cert.crt:ro - ${CERT?err}cherished.me.key:/defaults/custom-cert.key:ro - ${CONF?err}ggrav.subfolder.conf:/config/nginx/proxy-confs/ggrav.subfolder.conf:ro - ${CONF?err}mailu.subfolder.conf:/config/nginx/proxy-confs/mailu.subfolder.conf:ro - ${CONF?err}nextc.subfolder.conf:/config/nginx/proxy-confs/nextc.subfolder.conf:ro - - ${CONF?err}swag-index.html:/config/www/index.html:ro + - ${CONF?err}swags-index.html:/config/www/index.html:ro ports: - "80:80" - "443:443" - depends_on: - - ggrav networks: - local - - front + - share ggrav: image: andrew/getgrav:1.7.37.1 @@ -105,6 +80,7 @@ services: restart: always volumes: - ${BIND?err}nextc-config:/config + - ${DATA?err}fmedia:/fmedia - ${DATA?err}ncdata:/ncdata environment: - PUID=1000 @@ -129,51 +105,3 @@ services: networks: - nextc - onlyo-ds: - image: docker.io/onlyoffice/documentserver:7.1 - restart: always - volumes: - - ${CONF?err}onlyo-ds.crt:/onlyo-ds.crt:ro - - ${CONF?err}onlyo-ds.key:/onlyo-ds.key:ro - - ${BIND?err}onlyo-ds-log:/var/log/onlyoffice - - ${BIND?err}onlyo-ds-lib:/var/lib/onlyoffice - - ${BIND?err}onlyo-ds-www:/var/www/onlyoffice/Data - - ${BIND?err}onlyo-ds-pg:/var/lib/postgresql - - ${BIND?err}onlyo-ds-rb:/var/lib/rabbitmq - - ${BIND?err}onlyo-ds-rd:/var/lib/redis - - ${BIND?err}onlyo-ds-font:/usr/share/fonts/truetype/custom - environment: - - ONLYOFFICE_HTTPS_HSTS_ENABLED=true - - ONLYOFFICE_HTTPS_HSTS_MAXAGE= - - SSL_CERTIFICATE_PATH=/onlyo-ds.crt - - SSL_KEY_PATH=/onlyo-ds.key - - SSL_DHPARAM_PATH= - - SSL_VERIFY_CLIENT= - - DB_TYPE= - - DB_HOST= - - DB_PORT= - - DB_NAME= - - DB_USER= - - DB_PWD= - - AMQP_URI= - - AMQP_TYPE= - - REDIS_SERVER_HOST= - - REDIS_SERVER_PORT= - - NGINX_WORKER_PROCESSES= - - NGINX_WORKER_CONNECTIONS= - - JWT_ENABLED= - - JWT_SECRET= - - JWT_HEADER= - - JWT_IN_BODY= - - USE_UNAUTHORIZED_STORAGE= - - GENERATE_FONTS= - - METRICS_ENABLED= - - METRICS_HOST= - - METRICS_PORT= - - METRICS_PREFIX= - - LETS_ENCRYPT_DOMAIN= - - LETS_ENCRYPT_MAIL= - networks: - - local - - diff --git a/docker-restore.sh b/docker-restore.sh old mode 100755 new mode 100644 index c1b2f65..4e8651c --- a/docker-restore.sh +++ b/docker-restore.sh @@ -1,18 +1,13 @@ #!/bin/bash -sudo docker run --rm \ +docker run --rm \ --name volumerize \ -e TZ=Australia/Perth \ -e VOLUMERIZE_SOURCE=/source \ -e VOLUMERIZE_TARGET=file:///backup \ -v backup_docker-cache:/volumerize-cache \ -v backup_docker-volume:/backup:ro \ - -v docker_admin-data:/source/docker_admin-data \ - -v docker_admin-dkim:/source/docker_admin-dkim \ - -v docker_antispam-filter:/source/docker_antispam-filter \ - -v docker_fail2ban-config:/source/docker_fail2ban-config \ - -v docker_front-overrides:/source/docker_front-overrides \ + -v docker_f2ban-config:/source/docker_f2ban-config \ -v docker_ggrav-html:/source/docker_ggrav-html \ - -v docker_imap-mail:/source/docker_imap-mail \ -v docker_nextc-config:/source/docker_nextc-config \ -v docker_nextc-db-config:/source/docker_nextc-db-config \ -v docker_onlyo-ds-font:/source/docker_onlyo-ds-font \ @@ -22,10 +17,6 @@ sudo docker run --rm \ -v docker_onlyo-ds-rb:/source/docker_onlyo-ds-rb \ -v docker_onlyo-ds-rd:/source/docker_onlyo-ds-rd \ -v docker_onlyo-ds-www:/source/docker_onlyo-ds-www \ - -v docker_redis-data:/source/docker_redis-data \ - -v docker_smtp-queue:/source/docker_smtp-queue \ - -v docker_swag-config:/source/docker_swag-config \ - -v docker_webmail-data:/source/docker_webmail-data \ - -v docker_webmail-overrides:/source/docker_webmail-overrides \ + -v docker_swags-config:/source/docker_swags-config \ blacklabelops/volumerize:1.7.1 restore