the-nine-worlds/ansible-edda
the-nine-worlds/ansible-edda
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Update URLs

Browse Source
This commit is contained in:
Wojciech Kozlowski 2023-08-16 23:21:11 +02:00
parent f62132169a
commit 4b38982e46
9 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
playbooks/files/services/deploy/lrproxy/nginx-conf.d/archive.music.wojciechkozlowski.eu.conf → playbooks/files/services/deploy/lrproxy/nginx-conf.d/archive.music.thenineworlds.net.conf
View File

@ -1,7 +1,7 @@
server { server {
listen [::]:80; listen [::]:80;
listen 80; listen 80;
server_name archive.music.wojciechkozlowski.eu; server_name archive.music.thenineworlds.net;
location ^~ /.well-known { location ^~ /.well-known {
allow all; allow all;
@ -16,11 +16,11 @@ server {
server { server {
listen [::1]:443 ssl; listen [::1]:443 ssl;
listen 127.0.0.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 /etc/letsencrypt/live/archive.music.thenineworlds.net/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/archive.music.wojciechkozlowski.eu/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/archive.music.thenineworlds.net/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/archive.music.wojciechkozlowski.eu/chain.pem; ssl_trusted_certificate /etc/letsencrypt/live/archive.music.thenineworlds.net/chain.pem;
location / { location / {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;

10
playbooks/files/services/deploy/lrproxy/nginx-conf.d/git.wojciechkozlowski.eu.conf → playbooks/files/services/deploy/lrproxy/nginx-conf.d/git.thenineworlds.net.conf
View File

@ -1,7 +1,7 @@
server { server {
listen [::]:80; listen [::]:80;
listen 80; listen 80;
server_name git.wojciechkozlowski.eu; server_name git.thenineworlds.net;
location ^~ /.well-known { location ^~ /.well-known {
allow all; allow all;
@ -16,11 +16,11 @@ server {
server { server {
listen [::1]:443 ssl; listen [::1]:443 ssl;
listen 127.0.0.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 /etc/letsencrypt/live/git.thenineworlds.net/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/git.wojciechkozlowski.eu/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/git.thenineworlds.net/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/git.wojciechkozlowski.eu/chain.pem; ssl_trusted_certificate /etc/letsencrypt/live/git.thenineworlds.net/chain.pem;
location / { location / {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;

10
playbooks/files/services/deploy/lrproxy/nginx-conf.d/music.wojciechkozlowski.eu.conf → playbooks/files/services/deploy/lrproxy/nginx-conf.d/music.thenineworlds.net.conf
View File

@ -1,7 +1,7 @@
server { server {
listen [::]:80; listen [::]:80;
listen 80; listen 80;
server_name music.wojciechkozlowski.eu; server_name music.thenineworlds.net;
location ^~ /.well-known { location ^~ /.well-known {
allow all; allow all;
@ -16,11 +16,11 @@ server {
server { server {
listen [::1]:443 ssl; listen [::1]:443 ssl;
listen 127.0.0.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 /etc/letsencrypt/live/music.thenineworlds.net/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/music.wojciechkozlowski.eu/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/music.thenineworlds.net/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/music.wojciechkozlowski.eu/chain.pem; ssl_trusted_certificate /etc/letsencrypt/live/music.thenineworlds.net/chain.pem;
location / { location / {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;

10
playbooks/files/services/deploy/lrproxy/nginx-conf.d/notes.wojciechkozlowski.eu.conf → playbooks/files/services/deploy/lrproxy/nginx-conf.d/notes.thenineworlds.net.conf
View File

@ -1,7 +1,7 @@
server { server {
listen [::]:80; listen [::]:80;
listen 80; listen 80;
server_name notes.wojciechkozlowski.eu; server_name notes.thenineworlds.net;
location ^~ /.well-known { location ^~ /.well-known {
allow all; allow all;
@ -16,11 +16,11 @@ server {
server { server {
listen [::1]:443 ssl; listen [::1]:443 ssl;
listen 127.0.0.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 /etc/letsencrypt/live/notes.thenineworlds.net/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/notes.wojciechkozlowski.eu/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/notes.thenineworlds.net/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/notes.wojciechkozlowski.eu/chain.pem; ssl_trusted_certificate /etc/letsencrypt/live/notes.thenineworlds.net/chain.pem;
# Values copied from # Values copied from
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html and adjusted to # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html and adjusted to

3
playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service
View File

@ -35,12 +35,13 @@ ExecStart=/usr/bin/podman run \
-e GITEA__database__USER="{{ services[services_service_name].database.user }}" \ -e GITEA__database__USER="{{ services[services_service_name].database.user }}" \
-e GITEA__database__PASSWD="{{ services[services_service_name].database.password }}" \ -e GITEA__database__PASSWD="{{ services[services_service_name].database.password }}" \
-e GITEA__server__DOMAIN="{{ services[services_service_name].domain }}" \ -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__ROOT_URL="https://%(DOMAIN)s/" \
-e GITEA__server__START_SSH_SERVER="true" \ -e GITEA__server__START_SSH_SERVER="true" \
-e GITEA__server__SSH_PORT="{{ services[services_service_name].ssh_port }}" \ -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__server__SSH_LISTEN_PORT="{{ services[services_service_name].ssh_port }}" \
-e GITEA__mailer__ENABLED="true" \ -e GITEA__mailer__ENABLED="true" \
-e GITEA__mailer__FROM="Gitea <git@{{ services[services_service_name].domain }}>" \ -e GITEA__mailer__FROM="Gitea <noreply@{{ services[services_service_name].domain }}>" \
-e GITEA__mailer__MAILER_TYPE="smtp" \ -e GITEA__mailer__MAILER_TYPE="smtp" \
-e GITEA__mailer__HOST="{{ services[services_service_name].smtp.host }}" \ -e GITEA__mailer__HOST="{{ services[services_service_name].smtp.host }}" \
-e GITEA__mailer__USER="{{ services[services_service_name].smtp.user }}" \ -e GITEA__mailer__USER="{{ services[services_service_name].smtp.user }}" \

2
playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service
View File

@ -41,7 +41,7 @@ ExecStart=/usr/bin/podman run \
-e MAILER_AUTH_USER="{{ services[services_service_name].smtp.user }}" \ -e MAILER_AUTH_USER="{{ services[services_service_name].smtp.user }}" \
-e MAILER_AUTH_PASSWORD="{{ services[services_service_name].smtp.password }}" \ -e MAILER_AUTH_PASSWORD="{{ services[services_service_name].smtp.password }}" \
-e MAILER_NOREPLY_NAME="Joplin" \ -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" \ -e STORAGE_DRIVER="Type=Filesystem; Path=/data" \
--name=pod-notes-joplin \ --name=pod-notes-joplin \
docker.io/joplin/server:{{ services_service_deploy_versions.joplin }} docker.io/joplin/server:{{ services_service_deploy_versions.joplin }}

2
playbooks/roles/services/deploy/www/tasks/main.yml
View File

@ -53,7 +53,7 @@
repo: "\ repo: "\
https://{{ services[services_service_name].repo.user }}:\ https://{{ services[services_service_name].repo.user }}:\
{{ services[services_service_name].repo.token }}@\ {{ 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" dest: "{{ services_service_user_home }}/.config/service/wojciechkozlowski.eu"
recursive: true recursive: true
ignore_errors: true ignore_errors: true

8
playbooks/services.yml
View File

@ -85,11 +85,11 @@
services_service_name: "lrproxy" services_service_name: "lrproxy"
services_deploy_rproxy_nginx_stream_config: "files/services/deploy/lrproxy/stream.conf" services_deploy_rproxy_nginx_stream_config: "files/services/deploy/lrproxy/stream.conf"
services_deploy_rproxy_nginx_subdomain_config_files: 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/cloud.wojciechkozlowski.eu.conf"
- "files/services/deploy/lrproxy/nginx-conf.d/git.wojciechkozlowski.eu.conf" - "files/services/deploy/lrproxy/nginx-conf.d/git.thenineworlds.net.conf"
- "files/services/deploy/lrproxy/nginx-conf.d/music.wojciechkozlowski.eu.conf" - "files/services/deploy/lrproxy/nginx-conf.d/music.thenineworlds.net.conf"
- "files/services/deploy/lrproxy/nginx-conf.d/notes.wojciechkozlowski.eu.conf" - "files/services/deploy/lrproxy/nginx-conf.d/notes.thenineworlds.net.conf"
services_service_deploy_versions: "{{ services_deploy_versions.lrproxy }}" services_service_deploy_versions: "{{ services_deploy_versions.lrproxy }}"
when: "'lrproxy' in services_host_services" when: "'lrproxy' in services_host_services"
tags: "always" tags: "always"

2
roles

@ -1 +1 @@
Subproject commit b93d4a4dcb12bb36c27284d02015e074d8c3c870 Subproject commit a28aa00bbd7e930b4598eb350372f86162c600fc