diff --git a/conf.d/bitwarden.tryton.geeraert.eu.kube.conf.bak2 b/conf.d/bitwarden.tryton.geeraert.eu.kube.conf.bak2 deleted file mode 100644 index de2ca37..0000000 --- a/conf.d/bitwarden.tryton.geeraert.eu.kube.conf.bak2 +++ /dev/null @@ -1,45 +0,0 @@ -upstream bitwarden_backend { -# BITWARDEN SERVER DOCKER -# server 192.168.88.50:8080; -# NEW BITWARDEN SERVER kubernetes - server bitwarden-self-host-web.bitwarden-helm.svc:5000; -#bitwarden-self-host-admin.bitwarden.svc -# OLD BITWARDEN SERVER -# server 192.168.6.147; - - server 1.1.1.1 backup; - } - -server { - server_name bitwarden.tryton.geeraert.eu www.bitwarden.tryton.geeraert.eu; - location / { - proxy_pass http://bitwarden_backend; - } - - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem; - #include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - #ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - -} -server { - if ($host = www.bitwarden.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - if ($host = bitwarden.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name www.bitwarden.tryton.geeraert.eu bitwarden.tryton.geeraert.eu; - listen 80; - return 404; # managed by Certbot - -} - - diff --git a/conf.d/bitwarden_docker.tryton.geeraert.eu.conf.old b/conf.d/bitwarden_docker.tryton.geeraert.eu.conf.old deleted file mode 100644 index e098c75..0000000 --- a/conf.d/bitwarden_docker.tryton.geeraert.eu.conf.old +++ /dev/null @@ -1,44 +0,0 @@ -upstream bitwarden_backend { -# BITWARDEN SERVER DOCKER - server 192.168.88.50:8080; -# OLD BITWARDEN SERVER -# server 192.168.6.147; - - server 1.1.1.1 backup; - } - -server { - server_name bitwarden.tryton.geeraert.eu www.bitwarden.tryton.geeraert.eu; - location / { - proxy_pass http://bitwarden_backend; - } - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem; - #include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - #ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - -} -server { - if ($host = www.bitwarden.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - if ($host = bitwarden.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name www.bitwarden.tryton.geeraert.eu bitwarden.tryton.geeraert.eu; - listen 80; - return 404; # managed by Certbot - -} - - diff --git a/conf.d/bitwarden_kube.tryton.geeraert.eu.kube.conf b/conf.d/bitwarden_kube.tryton.geeraert.eu.kube.conf deleted file mode 100644 index 0fe8c18..0000000 --- a/conf.d/bitwarden_kube.tryton.geeraert.eu.kube.conf +++ /dev/null @@ -1,76 +0,0 @@ -upstream bitwarden_kube_backend { -# BITWARDEN SERVER DOCKER -# server 192.168.88.50:8080; -# NEW BITWARDEN SERVER kubernetes -# server bitwarden-self-host-web.bitwarden-helm.svc:5000; - server nginx.bitwarden.svc:8080; -#bitwarden-self-host-admin.bitwarden-helm.svc -# OLD BITWARDEN SERVER -# server 192.168.6.147; - -# server 1.1.1.1 backup; - } - -server { - server_name bitwarden.tryton.geeraert.eu www.bitwarden.tryton.geeraert.eu; - location / { - proxy_pass http://bitwarden_kube_backend; - } -# location /api/ { -# proxy_pass http://bitwarden-self-host-api.bitwarden-helm.svc:5000; - #proxy_pass http://10.106.163.98:5000; -# } -# location /attachments/ { -# proxy_pass http://bitwarden-self-host-api.bitwarden-helm.svc:5000; -# } -# location /icons/ { -# proxy_pass http://bitwarden-self-host-icons.bitwarden-helm.svc:5000; -# } -# location /notifications/ { -# proxy_pass http://bitwarden-self-host-notifications.bitwarden-helm.svc:5000; -# } -# location /events/ { -# proxy_pass http://bitwarden-self-host-events.bitwarden-helm.svc:5000; -# } -# location /scim/ { -# proxy_pass http://bitwarden-self-host-scim.bitwarden-helm.svc:5000; -# } -# location /sso/ { -# proxy_pass http://bitwarden-self-host-sso.bitwarden-helm.svc:5000; -# } -# location /identity/ { -# proxy_pass http://bitwarden-self-host-identity.bitwarden-helm.svc:5000; -# } -# location /admin/ { -# proxy_pass http://bitwarden-self-host-admin.bitwarden-helm.svc:5000; -# } - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem; - #include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - #ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - -} - - -server { - if ($host = www.bitwarden.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - if ($host = bitwarden.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name www.bitwarden.tryton.geeraert.eu bitwarden.tryton.geeraert.eu; - listen 80; - return 404; # managed by Certbot - -} diff --git a/conf.d/bitwarden_kube.tryton.geeraert.eu.kube.conf.old b/conf.d/bitwarden_kube.tryton.geeraert.eu.kube.conf.old deleted file mode 100644 index 0fe8c18..0000000 --- a/conf.d/bitwarden_kube.tryton.geeraert.eu.kube.conf.old +++ /dev/null @@ -1,76 +0,0 @@ -upstream bitwarden_kube_backend { -# BITWARDEN SERVER DOCKER -# server 192.168.88.50:8080; -# NEW BITWARDEN SERVER kubernetes -# server bitwarden-self-host-web.bitwarden-helm.svc:5000; - server nginx.bitwarden.svc:8080; -#bitwarden-self-host-admin.bitwarden-helm.svc -# OLD BITWARDEN SERVER -# server 192.168.6.147; - -# server 1.1.1.1 backup; - } - -server { - server_name bitwarden.tryton.geeraert.eu www.bitwarden.tryton.geeraert.eu; - location / { - proxy_pass http://bitwarden_kube_backend; - } -# location /api/ { -# proxy_pass http://bitwarden-self-host-api.bitwarden-helm.svc:5000; - #proxy_pass http://10.106.163.98:5000; -# } -# location /attachments/ { -# proxy_pass http://bitwarden-self-host-api.bitwarden-helm.svc:5000; -# } -# location /icons/ { -# proxy_pass http://bitwarden-self-host-icons.bitwarden-helm.svc:5000; -# } -# location /notifications/ { -# proxy_pass http://bitwarden-self-host-notifications.bitwarden-helm.svc:5000; -# } -# location /events/ { -# proxy_pass http://bitwarden-self-host-events.bitwarden-helm.svc:5000; -# } -# location /scim/ { -# proxy_pass http://bitwarden-self-host-scim.bitwarden-helm.svc:5000; -# } -# location /sso/ { -# proxy_pass http://bitwarden-self-host-sso.bitwarden-helm.svc:5000; -# } -# location /identity/ { -# proxy_pass http://bitwarden-self-host-identity.bitwarden-helm.svc:5000; -# } -# location /admin/ { -# proxy_pass http://bitwarden-self-host-admin.bitwarden-helm.svc:5000; -# } - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem; - #include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - #ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - -} - - -server { - if ($host = www.bitwarden.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - if ($host = bitwarden.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name www.bitwarden.tryton.geeraert.eu bitwarden.tryton.geeraert.eu; - listen 80; - return 404; # managed by Certbot - -} diff --git a/conf.d/bookstack.tryton.geeraert.eu.conf b/conf.d/bookstack.tryton.geeraert.eu.conf index d6cdd75..8a0aa84 100644 --- a/conf.d/bookstack.tryton.geeraert.eu.conf +++ b/conf.d/bookstack.tryton.geeraert.eu.conf @@ -1,48 +1,52 @@ +############################################ +# config file for bookstack +############################################ + upstream bookstack_backend { - server webserver.bookstack.svc; - server 1.1.1.1 backup; + server webserver.bookstack.svc; + server 1.1.1.1 backup; } server { - server_name bookstack.tryton.geeraert.eu www.bookstack.tryton.geeraert.eu; + server_name bookstack.tryton.geeraert.eu www.bookstack.tryton.geeraert.eu; location / { - proxy_pass http://bookstack_backend; + proxy_pass http://bookstack_backend; + location ~* \.(html|css|jpg|gif|ico|js)$ { - proxy_cache cache; - proxy_cache_key $host$uri$is_args$args; - proxy_cache_valid 200 301 302 30m; - expires 30m; - proxy_pass http://bookstack_backend; - } - + proxy_cache cache; + proxy_cache_key $host$uri$is_args$args; + proxy_cache_valid 200 301 302 30m; + expires 30m; + proxy_pass http://bookstack_backend; + } + } location /.well-known/acme-challenge/ { - root /var/www/certbot; + root /var/www/certbot; } - - listen 443 ssl; # managed by Certbot + + + + + + + listen 443 ssl; ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem; ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem; - #include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - #ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - } server { - if ($host = www.bookstack.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot + if ($host = www.bookstack.tryton.geeraert.eu) { + return 301 https://$host$request_uri; + } - if ($host = bookstack.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - + if ($host = bookstack.tryton.geeraert.eu) { + return 301 https://$host$request_uri; + } server_name www.bookstack.tryton.geeraert.eu bookstack.tryton.geeraert.eu; - listen 80; - return 404; # managed by Certbot + listen 80; + return 404; } - - diff --git a/conf.d/camera.tryton.geeraert.eu.conf.BAK b/conf.d/camera.tryton.geeraert.eu.conf.BAK deleted file mode 100644 index 7fca46b..0000000 --- a/conf.d/camera.tryton.geeraert.eu.conf.BAK +++ /dev/null @@ -1,17 +0,0 @@ -upstream camera_backend { - server 192.168.88.36; - server 1.1.1.1 backup; - } - -server { - server_name camera.tryton.geeraert.eu www.camera.tryton.geeraert.eu; - location / { - proxy_pass http://camera_backend; - } - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - listen 80 ; -} - diff --git a/conf.d/netdata.tryton.geeraert.eu.conf b/conf.d/netdata.tryton.geeraert.eu.conf deleted file mode 100644 index 5cb28ac..0000000 --- a/conf.d/netdata.tryton.geeraert.eu.conf +++ /dev/null @@ -1,43 +0,0 @@ -upstream netdata_backend { -#kube server - server netdata-agent.netdata.svc:19999; -#old server - #server 192.168.88.50:19999; - server 1.1.1.1 backup; - } - -server { - server_name netdata.tryton.geeraert.eu www.netdata.tryton.geeraert.eu; - location / { - proxy_pass http://netdata_backend; - } - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem; - #include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - #ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - -} -server { - if ($host = www.netdata.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - if ($host = netdata.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name www.netdata.tryton.geeraert.eu netdata.tryton.geeraert.eu; - listen 80; - return 404; # managed by Certbot - -} - - diff --git a/conf.d/nextcloud.tryton.geeraert.eu.conf.bak b/conf.d/nextcloud.tryton.geeraert.eu.conf.bak deleted file mode 100644 index 0bc1f8e..0000000 --- a/conf.d/nextcloud.tryton.geeraert.eu.conf.bak +++ /dev/null @@ -1,38 +0,0 @@ -upstream nextcloud_backend { - server 192.168.6.20; - server 1.1.1.1 backup; - } - -server { - server_name nextcloud.tryton.geeraert.eu www.nextcloud.tryton.geeraert.eu; - location / { - proxy_pass http://nextcloud_backend; - } - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem; # managed by Certbot - # managed by Certbot - -} -server { - if ($host = www.nextcloud.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - if ($host = nextcloud.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name www.nextcloud.tryton.geeraert.eu nextcloud.tryton.geeraert.eu; - listen 80; - return 404; # managed by Certbot - -} - - diff --git a/conf.d/opentrashmail.tryton.geeraert.eu.conf.bak b/conf.d/opentrashmail.tryton.geeraert.eu.conf similarity index 93% rename from conf.d/opentrashmail.tryton.geeraert.eu.conf.bak rename to conf.d/opentrashmail.tryton.geeraert.eu.conf index 4ce2f03..35c132d 100644 --- a/conf.d/opentrashmail.tryton.geeraert.eu.conf.bak +++ b/conf.d/opentrashmail.tryton.geeraert.eu.conf @@ -1,5 +1,6 @@ upstream opentrashmail_backend { - server opentrashmail.opentrashmail.svc; +# server opentrashmail.opentrashmail.svc; + server 1.1.1.1; server 1.1.1.1 backup; } diff --git a/conf.d/portainer.tryton.geeraert.eu.conf.bak b/conf.d/portainer.tryton.geeraert.eu.conf.bak deleted file mode 100644 index 9eace80..0000000 --- a/conf.d/portainer.tryton.geeraert.eu.conf.bak +++ /dev/null @@ -1,40 +0,0 @@ -upstream portainer_backend { - server localhost:9000; - server 1.1.1.1 backup; - } - -server { - server_name portainer.tryton.geeraert.eu www.portainer.tryton.geeraert.eu; - location / { - proxy_pass http://portainer_backend; - } - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem; - # managed by Certbot - # managed by Certbot - - -} -server { - if ($host = www.portainer.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - if ($host = portainer.tryton.geeraert.eu) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name www.portainer.tryton.geeraert.eu portainer.tryton.geeraert.eu; - listen 80; - return 404; # managed by Certbot - -} - - diff --git a/conf.d/proxmox.tryton.geeraert.eu.conf.bak b/conf.d/proxmox.tryton.geeraert.eu.conf similarity index 100% rename from conf.d/proxmox.tryton.geeraert.eu.conf.bak rename to conf.d/proxmox.tryton.geeraert.eu.conf diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl new file mode 100644 index 0000000..9fa96dc --- /dev/null +++ b/terraform/.terraform.lock.hcl @@ -0,0 +1,21 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/local" { + version = "2.5.1" + hashes = [ + "h1:8oTPe2VUL6E2d3OcrvqyjI4Nn/Y/UEQN26WLk5O/B0g=", + "zh:0af29ce2b7b5712319bf6424cb58d13b852bf9a777011a545fac99c7fdcdf561", + "zh:126063ea0d79dad1f68fa4e4d556793c0108ce278034f101d1dbbb2463924561", + "zh:196bfb49086f22fd4db46033e01655b0e5e036a5582d250412cc690fa7995de5", + "zh:37c92ec084d059d37d6cffdb683ccf68e3a5f8d2eb69dd73c8e43ad003ef8d24", + "zh:4269f01a98513651ad66763c16b268f4c2da76cc892ccfd54b401fff6cc11667", + "zh:51904350b9c728f963eef0c28f1d43e73d010333133eb7f30999a8fb6a0cc3d8", + "zh:73a66611359b83d0c3fcba2984610273f7954002febb8a57242bbb86d967b635", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:7ae387993a92bcc379063229b3cce8af7eaf082dd9306598fcd42352994d2de0", + "zh:9e0f365f807b088646db6e4a8d4b188129d9ebdbcf2568c8ab33bddd1b82c867", + "zh:b5263acbd8ae51c9cbffa79743fbcadcb7908057c87eb22fd9048268056efbc4", + "zh:dfcd88ac5f13c0d04e24be00b686d069b4879cc4add1b7b1a8ae545783d97520", + ] +} diff --git a/terraform/.terraform/providers/registry.terraform.io/hashicorp/local/2.5.1/linux_amd64/terraform-provider-local_v2.5.1_x5 b/terraform/.terraform/providers/registry.terraform.io/hashicorp/local/2.5.1/linux_amd64/terraform-provider-local_v2.5.1_x5 new file mode 100755 index 0000000..43dc3e7 Binary files /dev/null and b/terraform/.terraform/providers/registry.terraform.io/hashicorp/local/2.5.1/linux_amd64/terraform-provider-local_v2.5.1_x5 differ diff --git a/terraform/terraform.tfstate b/terraform/terraform.tfstate index 0258c18..7fbe1b7 100644 --- a/terraform/terraform.tfstate +++ b/terraform/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.9.2", - "serial": 24, + "serial": 26, "lineage": "a36de74c-83f8-01fe-0504-92c54a21d49e", "outputs": {}, "resources": [ @@ -39,6 +39,34 @@ ] ] }, + { + "index_key": "bookstack", + "schema_version": 0, + "attributes": { + "content": "############################################\n# config file for bookstack\n############################################\n\nupstream bookstack_backend {\n server webserver.bookstack.svc;\n server 1.1.1.1 backup;\n }\n\nserver {\n server_name bookstack.tryton.geeraert.eu www.bookstack.tryton.geeraert.eu;\n location / {\n proxy_pass http://bookstack_backend;\n \n location ~* \\.(html|css|jpg|gif|ico|js)$ {\n\t proxy_cache cache;\n\t proxy_cache_key $host$uri$is_args$args;\n\t proxy_cache_valid 200 301 302 30m;\n\t expires 30m;\n\t proxy_pass http://bookstack_backend;\n\t\t}\n \n }\n location /.well-known/acme-challenge/ {\n root /var/www/certbot;\n }\n\n \n\n\n \n\n listen 443 ssl;\n ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem;\n ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem;\n\n}\nserver {\n if ($host = www.bookstack.tryton.geeraert.eu) {\n return 301 https://$host$request_uri;\n }\n\n\n if ($host = bookstack.tryton.geeraert.eu) {\n return 301 https://$host$request_uri;\n }\n\n server_name www.bookstack.tryton.geeraert.eu bookstack.tryton.geeraert.eu;\n listen 80;\n return 404;\n\n}\n", + "content_base64": null, + "content_base64sha256": "OXSKkaAcbeozovKy/9nhsyLxfunVe6p3OZz0y+XnFv4=", + "content_base64sha512": "YGVEVKPjCgEqt8hA1k7BX9EyCdYzwtSrQ3v9/Pit63CYm1ip3ChlcOTVwFEg4vl+K+A2sYyAfgOQhglJLDWGCg==", + "content_md5": "f66b1e1c42e4f61b264079cb06117713", + "content_sha1": "d6b587bfdd8fd65d1c167c554274964a73c97308", + "content_sha256": "39748a91a01c6dea33a2f2b2ffd9e1b322f17ee9d57baa77399cf4cbe5e716fe", + "content_sha512": "60654454a3e30a012ab7c840d64ec15fd13209d633c2d4ab437bfdfcf8adeb70989b58a9dc286570e4d5c05120e2f97e2be036b18c807e03908609492c35860a", + "directory_permission": "0777", + "file_permission": "0777", + "filename": "../conf.d/bookstack.tryton.geeraert.eu.conf", + "id": "d6b587bfdd8fd65d1c167c554274964a73c97308", + "sensitive_content": null, + "source": null + }, + "sensitive_attributes": [ + [ + { + "type": "get_attr", + "value": "sensitive_content" + } + ] + ] + }, { "index_key": "keycloak", "schema_version": 0, diff --git a/terraform/terraform.tfstate.backup b/terraform/terraform.tfstate.backup index a0901a6..0258c18 100644 --- a/terraform/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.9.2", - "serial": 21, + "serial": 24, "lineage": "a36de74c-83f8-01fe-0504-92c54a21d49e", "outputs": {}, "resources": [ @@ -99,18 +99,18 @@ "index_key": "sonarr", "schema_version": 0, "attributes": { - "content": "############################################\n# config file for sonarr\n############################################\n\nupstream sonarr_backend {\n server sonarr.sonarr.svc;\n server 1.1.1.1 backup;\n }\n\nserver {\n server_name sonarr.tryton.geeraert.eu www.sonarr.tryton.geeraert.eu;\n location / {\n proxy_pass http://sonarr_backend;\n \n }\n location /.well-known/acme-challenge/ {\n root /var/www/certbot;\n }\n\n \n\n\n \n\n listen 443 ssl;\n ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem;\n ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem;\n\n}\nserver {\n if ($host = www.sonarr.tryton.geeraert.eu) {\n return 301 https://$host$request_uri;\n }\n\n\n if ($host = sonarr.tryton.geeraert.eu) {\n return 301 https://$host$request_uri;\n }\n\n server_name www.sonarr.tryton.geeraert.eu sonarr.tryton.geeraert.eu;\n listen 80;\n return 404;\n\n}\n", + "content": "############################################\n# config file for sonarr\n############################################\n\nupstream sonarr_backend {\n server sonarr.servarr.svc;\n server 1.1.1.1 backup;\n }\n\nserver {\n server_name sonarr.tryton.geeraert.eu www.sonarr.tryton.geeraert.eu;\n location / {\n proxy_pass http://sonarr_backend;\n \n }\n location /.well-known/acme-challenge/ {\n root /var/www/certbot;\n }\n\n \n\n\n \n\n listen 443 ssl;\n ssl_certificate /etc/nginx/ssl/live/tryton.geeraert.eu/fullchain.pem;\n ssl_certificate_key /etc/nginx/ssl/live/tryton.geeraert.eu/privkey.pem;\n\n}\nserver {\n if ($host = www.sonarr.tryton.geeraert.eu) {\n return 301 https://$host$request_uri;\n }\n\n\n if ($host = sonarr.tryton.geeraert.eu) {\n return 301 https://$host$request_uri;\n }\n\n server_name www.sonarr.tryton.geeraert.eu sonarr.tryton.geeraert.eu;\n listen 80;\n return 404;\n\n}\n", "content_base64": null, - "content_base64sha256": "cBLrCZvVQpCrpd4qrnjo9w6GH72dt9J7JCN9g45jqzw=", - "content_base64sha512": "YzksdZjT4t60IWwyT3rOizFUv+kU0Khikgl68M2kFw/TBsj1Tss8KPqWVJZJJlXXI3V//IAdKtGrsKNbD20n8w==", - "content_md5": "44ec179b2b43365181418bdcc90c8880", - "content_sha1": "f2a88dd0c08df07936593b7dc4fbf239d599aa99", - "content_sha256": "7012eb099bd54290aba5de2aae78e8f70e861fbd9db7d27b24237d838e63ab3c", - "content_sha512": "63392c7598d3e2deb4216c324f7ace8b3154bfe914d0a86292097af0cda4170fd306c8f54ecb3c28fa965496492655d723757ffc801d2ad1abb0a35b0f6d27f3", + "content_base64sha256": "A6ElmqlK5iz/RYdJ/AUwPhjtSrw+V2TMi7gS4fCLPTI=", + "content_base64sha512": "vdB+UAwb4ZQEWHJp0QFo8RHjdAmrxrhyDhZMlLbanI7WHZwpwNbkkqSD6k0lzjBeviWdwQ8kJ508nNjt1vSXig==", + "content_md5": "5626714858f4af5f2cba1d314804b819", + "content_sha1": "bb789b145b467d0b4f6a2bc0e3ddc3c2ac048946", + "content_sha256": "03a1259aa94ae62cff458749fc05303e18ed4abc3e5764cc8bb812e1f08b3d32", + "content_sha512": "bdd07e500c1be19404587269d10168f111e37409abc6b8720e164c94b6da9c8ed61d9c29c0d6e492a483ea4d25ce305ebe259dc10f24279d3c9cd8edd6f4978a", "directory_permission": "0777", "file_permission": "0777", "filename": "../conf.d/sonarr.tryton.geeraert.eu.conf", - "id": "f2a88dd0c08df07936593b7dc4fbf239d599aa99", + "id": "bb789b145b467d0b4f6a2bc0e3ddc3c2ac048946", "sensitive_content": null, "source": null }, diff --git a/terraform/variables.auto.tfvars b/terraform/variables.auto.tfvars index 78855a7..666e0f2 100644 --- a/terraform/variables.auto.tfvars +++ b/terraform/variables.auto.tfvars @@ -1,12 +1,20 @@ nginx_sites = { bitwarden = { - service = "nginx.bitwarden.svc:8080" + service = "nginx.bitwarden.svc:8080" proxy_cache = false extra_value_bool = false extra-value = false http2_bool = true } + bookstack = { + service = "webserver.bookstack.svc" + proxy_cache = true + extra_value_bool = false + extra-value = false + http2_bool = false + } + sonarr = { service = "sonarr.servarr.svc" proxy_cache = false