From 4b38982e466c23cc601bcd74b7a6173d9953fb1d Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Wed, 16 Aug 2023 23:21:11 +0200 Subject: [PATCH] Update URLs --- ...ki.eu.conf => archive.music.thenineworlds.net.conf} | 10 +++++----- ...echkozlowski.eu.conf => git.thenineworlds.net.conf} | 10 +++++----- ...hkozlowski.eu.conf => music.thenineworlds.net.conf} | 10 +++++----- ...hkozlowski.eu.conf => notes.thenineworlds.net.conf} | 10 +++++----- .../git/templates/systemd/container-git-gitea.service | 3 ++- .../templates/systemd/container-notes-joplin.service | 2 +- playbooks/roles/services/deploy/www/tasks/main.yml | 2 +- playbooks/services.yml | 8 ++++---- roles | 2 +- 9 files changed, 29 insertions(+), 28 deletions(-) rename playbooks/files/services/deploy/lrproxy/nginx-conf.d/{archive.music.wojciechkozlowski.eu.conf => archive.music.thenineworlds.net.conf} (79%) rename playbooks/files/services/deploy/lrproxy/nginx-conf.d/{git.wojciechkozlowski.eu.conf => git.thenineworlds.net.conf} (63%) rename playbooks/files/services/deploy/lrproxy/nginx-conf.d/{music.wojciechkozlowski.eu.conf => music.thenineworlds.net.conf} (62%) rename playbooks/files/services/deploy/lrproxy/nginx-conf.d/{notes.wojciechkozlowski.eu.conf => notes.thenineworlds.net.conf} (69%) diff --git a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/archive.music.wojciechkozlowski.eu.conf b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/archive.music.thenineworlds.net.conf similarity index 79% rename from playbooks/files/services/deploy/lrproxy/nginx-conf.d/archive.music.wojciechkozlowski.eu.conf rename to playbooks/files/services/deploy/lrproxy/nginx-conf.d/archive.music.thenineworlds.net.conf index 0c9b578..b9d08e0 100644 --- a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/archive.music.wojciechkozlowski.eu.conf +++ b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/archive.music.thenineworlds.net.conf @@ -1,7 +1,7 @@ server { listen [::]:80; listen 80; - server_name archive.music.wojciechkozlowski.eu; + server_name archive.music.thenineworlds.net; location ^~ /.well-known { allow all; @@ -16,11 +16,11 @@ server { server { listen [::1]:443 ssl; listen 127.0.0.1:443 ssl; - server_name archive.music.wojciechkozlowski.eu; + server_name archive.music.thenineworlds.net; - ssl_certificate /etc/letsencrypt/live/archive.music.wojciechkozlowski.eu/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/archive.music.wojciechkozlowski.eu/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/archive.music.wojciechkozlowski.eu/chain.pem; + ssl_certificate /etc/letsencrypt/live/archive.music.thenineworlds.net/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/archive.music.thenineworlds.net/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/archive.music.thenineworlds.net/chain.pem; location / { proxy_set_header X-Real-IP $remote_addr; diff --git a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/git.wojciechkozlowski.eu.conf b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/git.thenineworlds.net.conf similarity index 63% rename from playbooks/files/services/deploy/lrproxy/nginx-conf.d/git.wojciechkozlowski.eu.conf rename to playbooks/files/services/deploy/lrproxy/nginx-conf.d/git.thenineworlds.net.conf index db3be1c..8d414b1 100644 --- a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/git.wojciechkozlowski.eu.conf +++ b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/git.thenineworlds.net.conf @@ -1,7 +1,7 @@ server { listen [::]:80; listen 80; - server_name git.wojciechkozlowski.eu; + server_name git.thenineworlds.net; location ^~ /.well-known { allow all; @@ -16,11 +16,11 @@ server { server { listen [::1]:443 ssl; listen 127.0.0.1:443 ssl; - server_name git.wojciechkozlowski.eu; + server_name git.thenineworlds.net; - ssl_certificate /etc/letsencrypt/live/git.wojciechkozlowski.eu/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/git.wojciechkozlowski.eu/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/git.wojciechkozlowski.eu/chain.pem; + ssl_certificate /etc/letsencrypt/live/git.thenineworlds.net/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/git.thenineworlds.net/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/git.thenineworlds.net/chain.pem; location / { proxy_set_header X-Real-IP $remote_addr; diff --git a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/music.wojciechkozlowski.eu.conf b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/music.thenineworlds.net.conf similarity index 62% rename from playbooks/files/services/deploy/lrproxy/nginx-conf.d/music.wojciechkozlowski.eu.conf rename to playbooks/files/services/deploy/lrproxy/nginx-conf.d/music.thenineworlds.net.conf index b358e1e..2f11277 100644 --- a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/music.wojciechkozlowski.eu.conf +++ b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/music.thenineworlds.net.conf @@ -1,7 +1,7 @@ server { listen [::]:80; listen 80; - server_name music.wojciechkozlowski.eu; + server_name music.thenineworlds.net; location ^~ /.well-known { allow all; @@ -16,11 +16,11 @@ server { server { listen [::1]:443 ssl; listen 127.0.0.1:443 ssl; - server_name music.wojciechkozlowski.eu; + server_name music.thenineworlds.net; - ssl_certificate /etc/letsencrypt/live/music.wojciechkozlowski.eu/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/music.wojciechkozlowski.eu/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/music.wojciechkozlowski.eu/chain.pem; + ssl_certificate /etc/letsencrypt/live/music.thenineworlds.net/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/music.thenineworlds.net/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/music.thenineworlds.net/chain.pem; location / { proxy_set_header X-Real-IP $remote_addr; diff --git a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/notes.wojciechkozlowski.eu.conf b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/notes.thenineworlds.net.conf similarity index 69% rename from playbooks/files/services/deploy/lrproxy/nginx-conf.d/notes.wojciechkozlowski.eu.conf rename to playbooks/files/services/deploy/lrproxy/nginx-conf.d/notes.thenineworlds.net.conf index bbf45a2..feb1fd3 100644 --- a/playbooks/files/services/deploy/lrproxy/nginx-conf.d/notes.wojciechkozlowski.eu.conf +++ b/playbooks/files/services/deploy/lrproxy/nginx-conf.d/notes.thenineworlds.net.conf @@ -1,7 +1,7 @@ server { listen [::]:80; listen 80; - server_name notes.wojciechkozlowski.eu; + server_name notes.thenineworlds.net; location ^~ /.well-known { allow all; @@ -16,11 +16,11 @@ server { server { listen [::1]:443 ssl; listen 127.0.0.1:443 ssl; - server_name notes.wojciechkozlowski.eu; + server_name notes.thenineworlds.net; - ssl_certificate /etc/letsencrypt/live/notes.wojciechkozlowski.eu/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/notes.wojciechkozlowski.eu/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/notes.wojciechkozlowski.eu/chain.pem; + ssl_certificate /etc/letsencrypt/live/notes.thenineworlds.net/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/notes.thenineworlds.net/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/notes.thenineworlds.net/chain.pem; # Values copied from # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html and adjusted to diff --git a/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service b/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service index ad17a21..ce9a567 100644 --- a/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service +++ b/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service @@ -35,12 +35,13 @@ ExecStart=/usr/bin/podman run \ -e GITEA__database__USER="{{ services[services_service_name].database.user }}" \ -e GITEA__database__PASSWD="{{ services[services_service_name].database.password }}" \ -e GITEA__server__DOMAIN="{{ services[services_service_name].domain }}" \ + -e GITEA__server__SSH_DOMAIN="{{ services[services_service_name].domain }}" \ -e GITEA__server__ROOT_URL="https://%(DOMAIN)s/" \ -e GITEA__server__START_SSH_SERVER="true" \ -e GITEA__server__SSH_PORT="{{ services[services_service_name].ssh_port }}" \ -e GITEA__server__SSH_LISTEN_PORT="{{ services[services_service_name].ssh_port }}" \ -e GITEA__mailer__ENABLED="true" \ - -e GITEA__mailer__FROM="Gitea " \ + -e GITEA__mailer__FROM="Gitea " \ -e GITEA__mailer__MAILER_TYPE="smtp" \ -e GITEA__mailer__HOST="{{ services[services_service_name].smtp.host }}" \ -e GITEA__mailer__USER="{{ services[services_service_name].smtp.user }}" \ diff --git a/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service b/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service index de915fb..95dab26 100644 --- a/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service +++ b/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service @@ -41,7 +41,7 @@ ExecStart=/usr/bin/podman run \ -e MAILER_AUTH_USER="{{ services[services_service_name].smtp.user }}" \ -e MAILER_AUTH_PASSWORD="{{ services[services_service_name].smtp.password }}" \ -e MAILER_NOREPLY_NAME="Joplin" \ - -e MAILER_NOREPLY_EMAIL="notes@{{ services[services_service_name].domain }}" \ + -e MAILER_NOREPLY_EMAIL="noreply@{{ services[services_service_name].domain }}" \ -e STORAGE_DRIVER="Type=Filesystem; Path=/data" \ --name=pod-notes-joplin \ docker.io/joplin/server:{{ services_service_deploy_versions.joplin }} diff --git a/playbooks/roles/services/deploy/www/tasks/main.yml b/playbooks/roles/services/deploy/www/tasks/main.yml index 24e4652..44a94be 100644 --- a/playbooks/roles/services/deploy/www/tasks/main.yml +++ b/playbooks/roles/services/deploy/www/tasks/main.yml @@ -53,7 +53,7 @@ repo: "\ https://{{ services[services_service_name].repo.user }}:\ {{ services[services_service_name].repo.token }}@\ - git.wojciechkozlowski.eu/wojtek/wojciechkozlowski.eu.git" + git.thenineworlds.net/wojtek/wojciechkozlowski.eu.git" dest: "{{ services_service_user_home }}/.config/service/wojciechkozlowski.eu" recursive: true ignore_errors: true diff --git a/playbooks/services.yml b/playbooks/services.yml index 6e477ea..258ea5f 100644 --- a/playbooks/services.yml +++ b/playbooks/services.yml @@ -85,11 +85,11 @@ services_service_name: "lrproxy" services_deploy_rproxy_nginx_stream_config: "files/services/deploy/lrproxy/stream.conf" services_deploy_rproxy_nginx_subdomain_config_files: - - "files/services/deploy/lrproxy/nginx-conf.d/archive.music.wojciechkozlowski.eu.conf" + - "files/services/deploy/lrproxy/nginx-conf.d/archive.music.thenineworlds.net.conf" - "files/services/deploy/lrproxy/nginx-conf.d/cloud.wojciechkozlowski.eu.conf" - - "files/services/deploy/lrproxy/nginx-conf.d/git.wojciechkozlowski.eu.conf" - - "files/services/deploy/lrproxy/nginx-conf.d/music.wojciechkozlowski.eu.conf" - - "files/services/deploy/lrproxy/nginx-conf.d/notes.wojciechkozlowski.eu.conf" + - "files/services/deploy/lrproxy/nginx-conf.d/git.thenineworlds.net.conf" + - "files/services/deploy/lrproxy/nginx-conf.d/music.thenineworlds.net.conf" + - "files/services/deploy/lrproxy/nginx-conf.d/notes.thenineworlds.net.conf" services_service_deploy_versions: "{{ services_deploy_versions.lrproxy }}" when: "'lrproxy' in services_host_services" tags: "always" diff --git a/roles b/roles index b93d4a4..a28aa00 160000 --- a/roles +++ b/roles @@ -1 +1 @@ -Subproject commit b93d4a4dcb12bb36c27284d02015e074d8c3c870 +Subproject commit a28aa00bbd7e930b4598eb350372f86162c600fc