diff --git a/nginx/config.nginx b/nginx/config.nginx index a33c099..b28b04f 100644 --- a/nginx/config.nginx +++ b/nginx/config.nginx @@ -1,248 +1,3 @@ -server { - server_name gitea.skazochnik.spb.ru; - location / { - proxy_pass http://localhost:3005/; - client_max_body_size 0; - } - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/gitea.skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/gitea.skazochnik.spb.ru/privkey.pem; # managed by Certbot - include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot -} - -# server { -# server_name mattermost.skazochnik.spb.ru; - - -# listen 443 ssl http2; # managed by Certbot -# ssl_certificate /etc/letsencrypt/live/mattermost.skazochnik.spb.ru/fullchain.pem; # managed by Certbot -# ssl_certificate_key /etc/letsencrypt/live/mattermost.skazochnik.spb.ru/privkey.pem; # managed by Certbot -# include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot -# ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - -# http2_push_preload on; # Enable HTTP/2 Server Push - -# # ssl_session_timeout 1d; - -# # Enable TLS versions (TLSv1.3 is required upcoming HTTP/3 QUIC). -# # ssl_protocols TLSv1.2 TLSv1.3; - -# # Enable TLSv1.3's 0-RTT. Use $ssl_early_data when reverse proxying to -# # prevent replay attacks. -# # -# # @see: https://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_early_data -# ssl_early_data on; - -# # ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384'; -# # ssl_prefer_server_ciphers on; -# ssl_session_cache shared:SSL:50m; -# # HSTS (ngx_http_headers_module is required) (15768000 seconds = six months) -# add_header Strict-Transport-Security max-age=15768000; -# # OCSP Stapling --- -# # fetch OCSP records from URL in ssl_certificate and cache them -# ssl_stapling on; -# ssl_stapling_verify on; - -# # add_header X-Early-Data $tls1_3_early_data; - -# location ~ /api/v[0-9]+/(users/)?websocket$ { -# proxy_set_header Upgrade $http_upgrade; -# proxy_set_header Connection "upgrade"; -# client_max_body_size 50M; -# proxy_set_header Host $http_host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# proxy_set_header X-Forwarded-Proto $scheme; -# proxy_set_header X-Frame-Options SAMEORIGIN; -# proxy_buffers 256 16k; -# proxy_buffer_size 16k; -# client_body_timeout 60; -# send_timeout 300; -# lingering_timeout 5; -# proxy_connect_timeout 90; -# proxy_send_timeout 300; -# proxy_read_timeout 90s; -# proxy_http_version 1.1; -# proxy_pass http://localhost:8065; -# } - -# location / { -# client_max_body_size 50M; -# proxy_set_header Connection ""; -# proxy_set_header Host $http_host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# proxy_set_header X-Forwarded-Proto $scheme; -# proxy_set_header X-Frame-Options SAMEORIGIN; -# proxy_buffers 256 16k; -# proxy_buffer_size 16k; -# proxy_read_timeout 600s; -# # proxy_cache mattermost_cache; -# # proxy_cache_revalidate on; -# # proxy_cache_min_uses 2; -# # proxy_cache_use_stale timeout; -# # proxy_cache_lock on; -# proxy_http_version 1.1; -# proxy_pass http://localhost:8065; -# } -# } - -server { - server_name docs.skazochnik.spb.ru; - location / { - proxy_pass http://192.168.0.101:8880; - client_max_body_size 0; - } - - listen 443 ssl; - - ssl_certificate /etc/letsencrypt/live/docs.skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/docs.skazochnik.spb.ru/privkey.pem; # managed by Certbot -} - -# server { -# server_name castopod.skazochnik.spb.ru; -# location / { -# proxy_pass http://192.168.0.101:55001; -# client_max_body_size 0; -# proxy_set_header Host $http_host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# proxy_set_header X-Forwarded-Proto $scheme; -# } - -# listen 443 ssl; - -# ssl_certificate /etc/letsencrypt/live/castopod.skazochnik.spb.ru/fullchain.pem; # managed by Certbot -# ssl_certificate_key /etc/letsencrypt/live/castopod.skazochnik.spb.ru/privkey.pem; # managed by Certbot -# } - -# server { -# server_name summeet.skazochnik.spb.ru; -# location / { -# proxy_pass https://192.168.0.108:5090; -# client_max_body_size 0; -# proxy_set_header Host $http_host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# proxy_set_header X-Forwarded-Proto $scheme; -# } - -# listen 5090 ssl; - -# ssl_certificate /etc/letsencrypt/live/summeet.skazochnik.spb.ru/fullchain.pem; # managed by Certbot -# ssl_certificate_key /etc/letsencrypt/live/summeet.skazochnik.spb.ru/privkey.pem; # managed by Certbot -# } - - -server { - server_name conference.skazochnik.spb.ru; - listen 443 ssl; - location / { - root /var/www/empty/; - } - ssl_certificate /etc/letsencrypt/live/conference.skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/conference.skazochnik.spb.ru/privkey.pem; # managed by Certbot - -} - -server { - server_name photos.skazochnik.spb.ru; - listen 443 ssl; - location / { - proxy_pass http://localhost:7780/; - } - - ssl_certificate /etc/letsencrypt/live/photos.skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/photos.skazochnik.spb.ru/privkey.pem; # managed by Certbot -} - -server { - server_name skazochnik.spb.ru; - location / { - proxy_pass http://gipat:5002/; - sub_filter "http://gipat:5002/" "https://skazochnik.spb.ru/"; - client_max_body_size 0; - } - - listen 443 ssl default_server; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/skazochnik.spb.ru/privkey.pem; # managed by Certbot - include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot -} - -server { - server_name skazochnik.spb.ru; - location / { - root /var/www/website_frontend; - index index.html index.htm; - } - - listen 8989 ssl default_server; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/skazochnik.spb.ru/privkey.pem; # managed by Certbot - include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot -} - -server { - listen 443 ssl; - server_name podcast.skazochnik.spb.ru; - location / { - root /var/www/podcast; - index index.html index.htm; - } - - ssl_certificate /etc/letsencrypt/live/podcast.skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/podcast.skazochnik.spb.ru/privkey.pem; # managed by Certbot -} - -server { - if ($host = gitea.skazochnik.spb.ru) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name gitea.skazochnik.spb.ru; - listen 80; - return 404; # managed by Certbot - - -} - -# server { -# if ($host = mattermost.skazochnik.spb.ru) { -# return 301 https://$host$request_uri; -# } # managed by Certbot - - -# server_name mattermost.skazochnik.spb.ru; -# listen 80; -# return 404; # managed by Certbot -# } - -server { - server_name wallabag.skazochnik.spb.ru; - - - location / { - proxy_pass http://localhost:8780; - # proxy_set_header X-Forwarded-Host $server_name; - # proxy_set_header X-Forwarded-Proto https; - # proxy_set_header X-Forwarded-For $remote_addr; - } - - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/wallabag.skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/wallabag.skazochnik.spb.ru/privkey.pem; # managed by Certbot - include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - -} \ No newline at end of file diff --git a/gitea/BACKUP.adoc b/services/gitea/BACKUP.adoc similarity index 100% rename from gitea/BACKUP.adoc rename to services/gitea/BACKUP.adoc diff --git a/gitea/docker-compose.yml b/services/gitea/docker-compose.yml similarity index 100% rename from gitea/docker-compose.yml rename to services/gitea/docker-compose.yml diff --git a/services/gitea/gitea.nginx.conf b/services/gitea/gitea.nginx.conf new file mode 100644 index 0000000..900854e --- /dev/null +++ b/services/gitea/gitea.nginx.conf @@ -0,0 +1,27 @@ +server { + server_name gitea.skazochnik.spb.ru; + location / { + proxy_pass http://localhost:3005/; + client_max_body_size 0; + } + + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/gitea.skazochnik.spb.ru/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/gitea.skazochnik.spb.ru/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + +} + +server { + if ($host = gitea.skazochnik.spb.ru) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + server_name gitea.skazochnik.spb.ru; + listen 80; + return 404; # managed by Certbot +} + diff --git a/nextcloud/.gitignore b/services/nextcloud/.gitignore similarity index 100% rename from nextcloud/.gitignore rename to services/nextcloud/.gitignore diff --git a/nextcloud/BACKUP.adoc b/services/nextcloud/BACKUP.adoc similarity index 100% rename from nextcloud/BACKUP.adoc rename to services/nextcloud/BACKUP.adoc diff --git a/nextcloud/data/config/config.php b/services/nextcloud/data/config/config.php similarity index 100% rename from nextcloud/data/config/config.php rename to services/nextcloud/data/config/config.php diff --git a/nextcloud/docker-compose.yml b/services/nextcloud/docker-compose.yml similarity index 100% rename from nextcloud/docker-compose.yml rename to services/nextcloud/docker-compose.yml diff --git a/services/nextcloud/nextcloud.nginx.conf b/services/nextcloud/nextcloud.nginx.conf new file mode 100644 index 0000000..4e919f6 --- /dev/null +++ b/services/nextcloud/nextcloud.nginx.conf @@ -0,0 +1,14 @@ +server { + server_name skazochnik.spb.ru; + location / { + proxy_pass http://gipat:5002/; + sub_filter "http://gipat:5002/" "https://skazochnik.spb.ru/"; + client_max_body_size 0; + } + + listen 443 ssl default_server; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/skazochnik.spb.ru/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/skazochnik.spb.ru/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot +} \ No newline at end of file diff --git a/pigallery/BACKUP.adoc b/services/pigallery/BACKUP.adoc similarity index 100% rename from pigallery/BACKUP.adoc rename to services/pigallery/BACKUP.adoc diff --git a/pigallery/config/config.json b/services/pigallery/config/config.json similarity index 100% rename from pigallery/config/config.json rename to services/pigallery/config/config.json diff --git a/pigallery/db-data/.gitstub b/services/pigallery/db-data/.gitstub similarity index 100% rename from pigallery/db-data/.gitstub rename to services/pigallery/db-data/.gitstub diff --git a/pigallery/docker-compose.yml b/services/pigallery/docker-compose.yml similarity index 100% rename from pigallery/docker-compose.yml rename to services/pigallery/docker-compose.yml diff --git a/services/pigallery/pigallery.nginx.conf b/services/pigallery/pigallery.nginx.conf new file mode 100644 index 0000000..58c1091 --- /dev/null +++ b/services/pigallery/pigallery.nginx.conf @@ -0,0 +1,10 @@ +server { + server_name photos.skazochnik.spb.ru; + listen 443 ssl; + location / { + proxy_pass http://localhost:7780/; + } + + ssl_certificate /etc/letsencrypt/live/photos.skazochnik.spb.ru/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/photos.skazochnik.spb.ru/privkey.pem; # managed by Certbot +} diff --git a/pigallery/tmp/.gitstub b/services/pigallery/tmp/.gitstub similarity index 100% rename from pigallery/tmp/.gitstub rename to services/pigallery/tmp/.gitstub diff --git a/services/podcast/podcast.nginx.conf b/services/podcast/podcast.nginx.conf new file mode 100644 index 0000000..c320e41 --- /dev/null +++ b/services/podcast/podcast.nginx.conf @@ -0,0 +1,11 @@ +server { + listen 443 ssl; + server_name podcast.skazochnik.spb.ru; + location / { + root /var/www/podcast; + index index.html index.htm; + } + + ssl_certificate /etc/letsencrypt/live/podcast.skazochnik.spb.ru/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/podcast.skazochnik.spb.ru/privkey.pem; # managed by Certbot +} \ No newline at end of file diff --git a/portainer/docker-compose.yml b/services/portainer/docker-compose.yml similarity index 61% rename from portainer/docker-compose.yml rename to services/portainer/docker-compose.yml index a01f838..bded814 100644 --- a/portainer/docker-compose.yml +++ b/services/portainer/docker-compose.yml @@ -3,11 +3,8 @@ version: '3' services: portainer: image: portainer/portainer-ce -# command: --sslcert /certs/tls.crt --sslkey /certs/tls.key -# hostname: kb-bizon.digdes.com ports: - 8077:9000 -# - 9077:9443 volumes: - /var/run/docker.sock:/var/run/docker.sock - portainer_data:/data diff --git a/services/portainer/portainer.nginx.conf b/services/portainer/portainer.nginx.conf new file mode 100644 index 0000000..f4e8472 --- /dev/null +++ b/services/portainer/portainer.nginx.conf @@ -0,0 +1,10 @@ +server { + listen 443 ssl; + server_name portainer.skazochnik.spb.ru; + location / { + proxy_pass http://localhost:8077 + } + + ssl_certificate /etc/letsencrypt/live/portainer.skazochnik.spb.ru/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/portainer.skazochnik.spb.ru/privkey.pem; # managed by Certbot +} \ No newline at end of file diff --git a/samba/smb.conf b/services/samba/smb.conf similarity index 100% rename from samba/smb.conf rename to services/samba/smb.conf diff --git a/transmission/BACKUP.adoc b/services/transmission/BACKUP.adoc similarity index 100% rename from transmission/BACKUP.adoc rename to services/transmission/BACKUP.adoc