diff --git a/.gitignore b/.gitignore index 512231c..0e3f20f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,24 @@ /*.tar.gz -/letsencrypt-logs/letsencrypt.log* -/letsencrypt-etc/live/* -/letsencrypt-etc/archive/* -/letsencrypt-etc/renewal/*.conf -/servnest/ht/fs/* -/servnest/ht/uri/ht.servnest.test/* -/servnest/ht/uri/* -/servnest/ns/*.zone -/servnest/reg/servnest.test.zone -/servnest/reg/test.servnest.test.zone -/servnest/tor-config/* -/sftpgo-logs/sftpgo.log -/php-logs/error.log -/cronie-logs/*.log -/nginx-logs/servnest-access.log -/nginx-logs/error.log -/apache-logs/error.log -/letsencrypt-etc/accounts/acme-staging-v02.api.letsencrypt.org/directory/*/*.json -/knot-sock/knot.pid -/knot-varlib/confdb/*.mdb -/knot-varlib/servnest.test.invalid.zone +/data/servnest.db +/logs/certbot/letsencrypt.log* +/data/certbot/live/*/*.pem +/data/certbot/archive/*/*.pem +/data/certbot/**/README +/data/certbot/renewal/*.conf +/data/ht/fs/* +/data/ht/uri/ht.servnest.test/* +/data/ht/uri/* +/data/ns/*.zone +/data/reg/servnest.test.zone +/data/reg/test.servnest.test.zone +/data/tor-config/* +/logs/sftpgo/sftpgo.log +/logs/php/error.log +/logs/cronie/*.log +/logs/nginx/servnest-access.log +/logs/nginx/error.log +/logs/apache/error.log +/data/certbot/accounts/acme-staging-v02.api.letsencrypt.org/directory/*/*.json +/sock/knot/knot.pid +/data/knot/confdb/*.mdb +/data/knot/servnest.test.invalid.zone diff --git a/compose.yaml b/compose.yaml index 834aa26..a6abe37 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,13 +7,13 @@ services: build: dockerfile: tor.Containerfile volumes: - - ./tor-client/:/run/tor-client/:rw - - ./tor-control/:/run/tor-control/:rw - - ./nginx-onion-sock/:/run/nginx-onion/:rw - - ./servnest/tor-keys/:/srv/servnest/tor-keys/:rw - - ./servnest/tor-config/:/srv/servnest/tor-config/:ro - - ./install/torrc:/etc/tor/torrc:ro - - ./tor-varlib/:/var/lib/:rw + - ./conf/torrc:/etc/tor/torrc:ro + - ./data/tor-config/:/srv/servnest/tor-config/:ro + - ./data/tor-keys/:/srv/servnest/tor-keys/:rw + - ./sock/tor-client/:/run/tor-client/:rw + - ./sock/tor-control/:/run/tor-control/:rw + - ./sock/nginx-onion/:/run/nginx-onion/:rw + - ./tmp/tor/:/var/lib/:rw mem_limit: 128m sftpgo: extends: @@ -28,9 +28,9 @@ services: links: - nginx:servnest.test volumes: - - ./sftpgo-logs/:/var/log/sftpgo/:rw - - ./servnest/ht/fs/:/srv/servnest/ht/fs/:rw - - ./install/sftpgo.toml:/etc/sftpgo/sftpgo.toml:ro + - ./conf/sftpgo.toml:/etc/sftpgo/sftpgo.toml:ro + - ./data/ht/fs/:/srv/servnest/ht/fs/:rw + - ./logs/sftpgo/:/var/log/sftpgo/:rw mem_limit: 256mb knot: extends: @@ -42,10 +42,10 @@ services: - "[::1]:42053:42053/udp" - "[::1]:42053:42053/tcp" volumes: - - ./knot-sock/:/run/knot/:rw - - ./servnest/reg/:/srv/servnest/reg/:rw - - ./servnest/ns/:/srv/servnest/ns/:rw - - ./knot-varlib/:/var/lib/knot/:rw + - ./data/reg/:/srv/servnest/reg/:rw + - ./data/ns/:/srv/servnest/ns/:rw + - ./data/knot/:/var/lib/knot/:rw + - ./sock/knot/:/run/knot/:rw apache: extends: file: base.yaml @@ -53,10 +53,10 @@ services: build: dockerfile: apache.Containerfile volumes: - - ./apache-logs/:/var/log/apache2/:rw - - ./servnest/ht/:/srv/servnest/ht/:ro - - ./install/http-messages/:/srv/servnest/ht/http-messages/:ro - - ./install/apache/:/etc/apache2/:ro + - ./conf/apache/:/etc/apache2/:ro + - ./conf/http-messages/:/srv/servnest/ht/http-messages/:ro + - ./data/ht/:/srv/servnest/ht/:ro + - ./logs/apache/:/var/log/apache2/:rw php: extends: file: base.yaml @@ -71,28 +71,28 @@ services: - nginx:ht.servnest.test - sftpgo:sftp.servnest.test volumes: - - ./php-logs/:/var/log/php83/:rw - - ./servnest/core/:/srv/servnest/core/:ro - - ./servnest/core/db/:/srv/servnest/core/db/:rw - - ./servnest/reg/:/srv/servnest/reg/:rw - - ./servnest/ns/:/srv/servnest/ns/:rw - - ./servnest/acme/:/srv/servnest/acme/:rw - - ./servnest/ht/fs/:/srv/servnest/ht/fs/:rw - - ./servnest/ht/uri/:/srv/servnest/ht/uri/:rw - - ./servnest/tor-config/:/srv/servnest/tor-config/:rw - - ./servnest/tor-keys/:/srv/servnest/tor-keys/:rw - - ./php-sock/:/run/php-fpm/:rw - - ./tor-client/:/run/tor-client/:rw - - ./tor-control/:/run/tor-control/:rw - - ./knot-sock/:/run/knot/:rw - - ./install/php.ini:/etc/php82/conf.d/servnest.ini:ro - - ./install/php-fpm.conf:/etc/php83/php-fpm.d/servnest.conf:ro - - ./install/sudoers:/etc/sudoers.d/servnest:ro - - ./letsencrypt-etc/:/etc/letsencrypt/:rw - - ./letsencrypt-varlib/:/var/lib/letsencrypt/:rw - - ./letsencrypt-logs/:/var/log/letsencrypt/:rw - - ./install/certbot.ini:/etc/letsencrypt/servnest.ini:ro - - ./install/certbot-deploy-hook.sh:/root/certbot-deploy-hook.sh:ro + - ./core/:/srv/servnest/core/:ro + - ./core/db/:/srv/servnest/core/db/:rw + - ./conf/php.ini:/etc/php82/conf.d/servnest.ini:ro + - ./conf/php-fpm.conf:/etc/php83/php-fpm.d/servnest.conf:ro + - ./conf/sudoers:/etc/sudoers.d/servnest:ro + - ./conf/certbot.ini:/etc/letsencrypt/servnest.ini:ro + - ./conf/certbot-deploy-hook.sh:/root/certbot-deploy-hook.sh:ro + - ./data/reg/:/srv/servnest/reg/:rw + - ./data/ns/:/srv/servnest/ns/:rw + - ./data/ht/fs/:/srv/servnest/ht/fs/:rw + - ./data/ht/uri/:/srv/servnest/ht/uri/:rw + - ./data/tor-config/:/srv/servnest/tor-config/:rw + - ./data/tor-keys/:/srv/servnest/tor-keys/:rw + - ./data/certbot/:/etc/letsencrypt/:rw + - ./sock/php/:/run/php-fpm/:rw + - ./sock/tor-client/:/run/tor-client/:rw + - ./sock/tor-control/:/run/tor-control/:rw + - ./sock/knot/:/run/knot/:rw + - ./logs/php/:/var/log/php83/:rw + - ./logs/certbot/:/var/log/letsencrypt/:rw + - ./tmp/acme/:/srv/servnest/acme/:rw + - ./tmp/certbot/:/var/lib/letsencrypt/:rw mem_limit: 256mb # For sudo security_opt: @@ -107,8 +107,8 @@ services: build: dockerfile: cronie.Containerfile volumes: - - ./install/cronie:/etc/cron.d/servnest:ro - - ./cronie-logs/:/var/log/cronie/:rw + - ./conf/cronie:/etc/cron.d/servnest:ro + - ./logs/cronie/:/var/log/cronie/:rw nginx: extends: file: base.yaml @@ -121,12 +121,12 @@ services: depends_on: - apache volumes: - - ./nginx-logs/:/var/lib/nginx/logs/:rw - - ./nginx-tmp/:/var/lib/nginx/tmp/:rw - - ./servnest/core/:/srv/servnest/core/:ro - - ./servnest/acme/:/srv/servnest/acme/:ro - - ./letsencrypt-etc/live/:/etc/letsencrypt/live/:ro - - ./letsencrypt-etc/archive/:/etc/letsencrypt/archive/:ro - - ./php-sock/:/run/php-fpm/:rw - - ./nginx-onion-sock/:/run/nginx-onion/:rw - - ./install/nginx/:/etc/nginx/:ro + - ./core/:/srv/servnest/core/:ro + - ./conf/nginx/:/etc/nginx/:ro + - ./data/certbot/live/:/etc/letsencrypt/live/:ro + - ./data/certbot/archive/:/etc/letsencrypt/archive/:ro + - ./sock/php/:/run/php-fpm/:rw + - ./sock/nginx-onion/:/run/nginx-onion/:rw + - ./logs/nginx/:/var/lib/nginx/logs/:rw + - ./tmp/nginx/:/var/lib/nginx/tmp/:rw + - ./tmp/acme/:/srv/servnest/acme/:ro diff --git a/install/apache/errors.conf b/conf/apache/errors.conf similarity index 100% rename from install/apache/errors.conf rename to conf/apache/errors.conf diff --git a/install/apache/httpd.conf b/conf/apache/httpd.conf similarity index 100% rename from install/apache/httpd.conf rename to conf/apache/httpd.conf diff --git a/install/apache/types b/conf/apache/types similarity index 100% rename from install/apache/types rename to conf/apache/types diff --git a/install/certbot-deploy-hook.sh b/conf/certbot-deploy-hook.sh similarity index 100% rename from install/certbot-deploy-hook.sh rename to conf/certbot-deploy-hook.sh diff --git a/install/certbot-dns-challenge-hook.sh b/conf/certbot-dns-challenge-hook.sh similarity index 100% rename from install/certbot-dns-challenge-hook.sh rename to conf/certbot-dns-challenge-hook.sh diff --git a/install/certbot-dns-cleanup-hook.sh b/conf/certbot-dns-cleanup-hook.sh similarity index 100% rename from install/certbot-dns-cleanup-hook.sh rename to conf/certbot-dns-cleanup-hook.sh diff --git a/install/certbot.ini b/conf/certbot.ini similarity index 100% rename from install/certbot.ini rename to conf/certbot.ini diff --git a/install/cronie b/conf/cronie similarity index 100% rename from install/cronie rename to conf/cronie diff --git a/install/http-messages/400.html b/conf/http-messages/400.html similarity index 100% rename from install/http-messages/400.html rename to conf/http-messages/400.html diff --git a/install/http-messages/403.html b/conf/http-messages/403.html similarity index 100% rename from install/http-messages/403.html rename to conf/http-messages/403.html diff --git a/install/http-messages/404.en.html b/conf/http-messages/404.en.html similarity index 100% rename from install/http-messages/404.en.html rename to conf/http-messages/404.en.html diff --git a/install/http-messages/404.fr.html b/conf/http-messages/404.fr.html similarity index 100% rename from install/http-messages/404.fr.html rename to conf/http-messages/404.fr.html diff --git a/install/http-messages/405.html b/conf/http-messages/405.html similarity index 100% rename from install/http-messages/405.html rename to conf/http-messages/405.html diff --git a/install/http-messages/410.html b/conf/http-messages/410.html similarity index 100% rename from install/http-messages/410.html rename to conf/http-messages/410.html diff --git a/install/http-messages/418.html b/conf/http-messages/418.html similarity index 100% rename from install/http-messages/418.html rename to conf/http-messages/418.html diff --git a/install/http-messages/500.en.html b/conf/http-messages/500.en.html similarity index 100% rename from install/http-messages/500.en.html rename to conf/http-messages/500.en.html diff --git a/install/http-messages/500.fr.html b/conf/http-messages/500.fr.html similarity index 100% rename from install/http-messages/500.fr.html rename to conf/http-messages/500.fr.html diff --git a/install/http-messages/502.html b/conf/http-messages/502.html similarity index 100% rename from install/http-messages/502.html rename to conf/http-messages/502.html diff --git a/install/http-messages/503.en.html b/conf/http-messages/503.en.html similarity index 100% rename from install/http-messages/503.en.html rename to conf/http-messages/503.en.html diff --git a/install/http-messages/503.fr.html b/conf/http-messages/503.fr.html similarity index 100% rename from install/http-messages/503.fr.html rename to conf/http-messages/503.fr.html diff --git a/install/http-messages/504.html b/conf/http-messages/504.html similarity index 100% rename from install/http-messages/504.html rename to conf/http-messages/504.html diff --git a/install/http-messages/security.txt b/conf/http-messages/security.txt similarity index 100% rename from install/http-messages/security.txt rename to conf/http-messages/security.txt diff --git a/install/http-messages/unsecure.en.html b/conf/http-messages/unsecure.en.html similarity index 100% rename from install/http-messages/unsecure.en.html rename to conf/http-messages/unsecure.en.html diff --git a/install/http-messages/unsecure.fr.html b/conf/http-messages/unsecure.fr.html similarity index 100% rename from install/http-messages/unsecure.fr.html rename to conf/http-messages/unsecure.fr.html diff --git a/install/knot.conf b/conf/knot.conf similarity index 100% rename from install/knot.conf rename to conf/knot.conf diff --git a/install/nginx/inc/apache-proxy.conf b/conf/nginx/inc/apache-proxy.conf similarity index 100% rename from install/nginx/inc/apache-proxy.conf rename to conf/nginx/inc/apache-proxy.conf diff --git a/install/nginx/inc/fastcgi.conf b/conf/nginx/inc/fastcgi.conf similarity index 100% rename from install/nginx/inc/fastcgi.conf rename to conf/nginx/inc/fastcgi.conf diff --git a/install/nginx/inc/messages.conf b/conf/nginx/inc/messages.conf similarity index 100% rename from install/nginx/inc/messages.conf rename to conf/nginx/inc/messages.conf diff --git a/install/nginx/inc/serve-static.conf b/conf/nginx/inc/serve-static.conf similarity index 100% rename from install/nginx/inc/serve-static.conf rename to conf/nginx/inc/serve-static.conf diff --git a/install/nginx/inc/types.conf b/conf/nginx/inc/types.conf similarity index 100% rename from install/nginx/inc/types.conf rename to conf/nginx/inc/types.conf diff --git a/install/nginx/nginx.conf b/conf/nginx/nginx.conf similarity index 100% rename from install/nginx/nginx.conf rename to conf/nginx/nginx.conf diff --git a/install/nginx/sites/dns.conf b/conf/nginx/sites/dns.conf similarity index 100% rename from install/nginx/sites/dns.conf rename to conf/nginx/sites/dns.conf diff --git a/install/nginx/sites/interface.conf b/conf/nginx/sites/interface.conf similarity index 100% rename from install/nginx/sites/interface.conf rename to conf/nginx/sites/interface.conf diff --git a/install/nginx/sites/no-tls.conf b/conf/nginx/sites/no-tls.conf similarity index 100% rename from install/nginx/sites/no-tls.conf rename to conf/nginx/sites/no-tls.conf diff --git a/install/nginx/sites/onion.conf b/conf/nginx/sites/onion.conf similarity index 100% rename from install/nginx/sites/onion.conf rename to conf/nginx/sites/onion.conf diff --git a/install/nginx/sites/sftpgo-auth.conf b/conf/nginx/sites/sftpgo-auth.conf similarity index 100% rename from install/nginx/sites/sftpgo-auth.conf rename to conf/nginx/sites/sftpgo-auth.conf diff --git a/install/nginx/sites/subdomain.conf b/conf/nginx/sites/subdomain.conf similarity index 100% rename from install/nginx/sites/subdomain.conf rename to conf/nginx/sites/subdomain.conf diff --git a/install/nginx/sites/subpath.conf b/conf/nginx/sites/subpath.conf similarity index 100% rename from install/nginx/sites/subpath.conf rename to conf/nginx/sites/subpath.conf diff --git a/install/php-fpm.conf b/conf/php-fpm.conf similarity index 100% rename from install/php-fpm.conf rename to conf/php-fpm.conf diff --git a/install/php-fpm.service.override.conf b/conf/php-fpm.service.override.conf similarity index 100% rename from install/php-fpm.service.override.conf rename to conf/php-fpm.service.override.conf diff --git a/install/php.ini b/conf/php.ini similarity index 100% rename from install/php.ini rename to conf/php.ini diff --git a/install/sftpgo.openrc b/conf/sftpgo.openrc similarity index 100% rename from install/sftpgo.openrc rename to conf/sftpgo.openrc diff --git a/install/sftpgo.service b/conf/sftpgo.service similarity index 100% rename from install/sftpgo.service rename to conf/sftpgo.service diff --git a/install/sftpgo.toml b/conf/sftpgo.toml similarity index 100% rename from install/sftpgo.toml rename to conf/sftpgo.toml diff --git a/install/sudoers b/conf/sudoers similarity index 100% rename from install/sudoers rename to conf/sudoers diff --git a/install/tor.service.override.conf b/conf/tor.service.override.conf similarity index 100% rename from install/tor.service.override.conf rename to conf/tor.service.override.conf diff --git a/install/torrc b/conf/torrc similarity index 100% rename from install/torrc rename to conf/torrc diff --git a/servnest/core b/core similarity index 100% rename from servnest/core rename to core diff --git a/letsencrypt-etc/servnest.ini b/data/certbot/servnest.ini similarity index 100% rename from letsencrypt-etc/servnest.ini rename to data/certbot/servnest.ini diff --git a/knot-sock/.gitkeep b/data/ns/.gitkeep similarity index 100% rename from knot-sock/.gitkeep rename to data/ns/.gitkeep diff --git a/nginx-onion-sock/.gitkeep b/sock/knot/.gitkeep similarity index 100% rename from nginx-onion-sock/.gitkeep rename to sock/knot/.gitkeep diff --git a/php-sock/.gitkeep b/sock/nginx-onion/.gitkeep similarity index 100% rename from php-sock/.gitkeep rename to sock/nginx-onion/.gitkeep diff --git a/servnest/ns/.gitkeep b/sock/php/.gitkeep similarity index 100% rename from servnest/ns/.gitkeep rename to sock/php/.gitkeep diff --git a/tor-client/.gitkeep b/sock/tor-client/.gitkeep similarity index 100% rename from tor-client/.gitkeep rename to sock/tor-client/.gitkeep