From 514654a974b3f8ec04d7480a9fa676d7e68a2f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Fri, 25 Oct 2024 00:52:35 +0200 Subject: [PATCH] [mod] rename:espe_frontend -> espe_frontend_zackeneule --- roles/espe_frontend-and-nginx/defaults/main.json | 5 ----- roles/espe_frontend-and-nginx/templates/conf.j2 | 16 ---------------- roles/espe_frontend/defaults/main.json | 12 ------------ roles/espe_frontend/templates/conf.json.j2 | 15 --------------- .../templates/conf.j2 | 0 .../defaults/main.json | 5 +++++ .../tasks/main.json | 6 +++--- .../templates/conf.j2 | 16 ++++++++++++++++ .../espe_frontend_zackeneule/defaults/main.json | 12 ++++++++++++ .../tasks/main.json | 10 +++++----- .../templates/conf.json.j2 | 15 +++++++++++++++ .../vardef.json | 0 12 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 roles/espe_frontend-and-nginx/defaults/main.json delete mode 100644 roles/espe_frontend-and-nginx/templates/conf.j2 delete mode 100644 roles/espe_frontend/defaults/main.json delete mode 100644 roles/espe_frontend/templates/conf.json.j2 rename roles/{espe_frontend-and-lighttpd => espe_frontend_zackeneule-and-lighttpd}/templates/conf.j2 (100%) create mode 100644 roles/espe_frontend_zackeneule-and-nginx/defaults/main.json rename roles/{espe_frontend-and-nginx => espe_frontend_zackeneule-and-nginx}/tasks/main.json (67%) create mode 100644 roles/espe_frontend_zackeneule-and-nginx/templates/conf.j2 create mode 100644 roles/espe_frontend_zackeneule/defaults/main.json rename roles/{espe_frontend => espe_frontend_zackeneule}/tasks/main.json (67%) create mode 100644 roles/espe_frontend_zackeneule/templates/conf.json.j2 rename roles/{espe_frontend => espe_frontend_zackeneule}/vardef.json (100%) diff --git a/roles/espe_frontend-and-nginx/defaults/main.json b/roles/espe_frontend-and-nginx/defaults/main.json deleted file mode 100644 index 9300075..0000000 --- a/roles/espe_frontend-and-nginx/defaults/main.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "var_espe_frontend_and_nginx_domain": "zackeneule.example.org", - "var_espe_frontend_and_nginx_directory": "/opt/zackeneule", - "var_espe_frontend_and_nginx_tls": true -} diff --git a/roles/espe_frontend-and-nginx/templates/conf.j2 b/roles/espe_frontend-and-nginx/templates/conf.j2 deleted file mode 100644 index 5679b14..0000000 --- a/roles/espe_frontend-and-nginx/templates/conf.j2 +++ /dev/null @@ -1,16 +0,0 @@ -server { - server_name {{var_espe_frontend_and_nginx_domain}}; - - listen 80; - listen [::]:80; -{% if var_espe_frontend_and_nginx_tls %} - listen [::]:443 ssl http2; - listen 443 ssl http2; - - ssl_certificate /etc/ssl/certs/{{var_espe_frontend_and_nginx_domain}}.pem; - ssl_certificate_key /etc/ssl/private/{{var_espe_frontend_and_nginx_domain}}.pem; - include /etc/nginx/ssl-hardening.conf; -{% endif %} - - root {{var_espe_frontend_and_nginx_directory}}; -} diff --git a/roles/espe_frontend/defaults/main.json b/roles/espe_frontend/defaults/main.json deleted file mode 100644 index 1491fa0..0000000 --- a/roles/espe_frontend/defaults/main.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "var_espe_frontend_git_reference": "master", - "var_espe_frontend_directory": "/opt/zackeneule", - "var_espe_frontend_user": "root", - "var_espe_frontend_title": "Zackeneule", - "var_espe_frontend_backend_scheme": "https", - "var_espe_frontend_backend_host": "espe.example.org", - "var_espe_frontend_backend_port": 4916, - "var_espe_frontend_backend_path_base": "", - "var_espe_frontend_registration_default_email_address": "both", - "var_espe_frontend_registration_default_email_redirect": true -} diff --git a/roles/espe_frontend/templates/conf.json.j2 b/roles/espe_frontend/templates/conf.json.j2 deleted file mode 100644 index e1d7974..0000000 --- a/roles/espe_frontend/templates/conf.json.j2 +++ /dev/null @@ -1,15 +0,0 @@ -{ - "backend": { - "scheme": "{{var_espe_frontend_backend_scheme}}", - "host": "{{var_espe_frontend_backend_host}}", - "port": {{var_espe_frontend_backend_port | string}}, - "path_base": "{{var_espe_frontend_backend_path_base}}" - }, - "settings" : { - "title": "{{var_espe_frontend_title}}", - "registration_defaults": { - "email_address": "{{var_espe_frontend_registration_default_email_address}}", - "email_redirect": {{var_espe_frontend_registration_default_email_redirect | to_json}}" - } - } -} diff --git a/roles/espe_frontend-and-lighttpd/templates/conf.j2 b/roles/espe_frontend_zackeneule-and-lighttpd/templates/conf.j2 similarity index 100% rename from roles/espe_frontend-and-lighttpd/templates/conf.j2 rename to roles/espe_frontend_zackeneule-and-lighttpd/templates/conf.j2 diff --git a/roles/espe_frontend_zackeneule-and-nginx/defaults/main.json b/roles/espe_frontend_zackeneule-and-nginx/defaults/main.json new file mode 100644 index 0000000..748bc8b --- /dev/null +++ b/roles/espe_frontend_zackeneule-and-nginx/defaults/main.json @@ -0,0 +1,5 @@ +{ + "var_espe_frontend_zackeneule_and_nginx_domain": "zackeneule.example.org", + "var_espe_frontend_zackeneule_and_nginx_directory": "/opt/zackeneule", + "var_espe_frontend_zackeneule_and_nginx_tls": true +} diff --git a/roles/espe_frontend-and-nginx/tasks/main.json b/roles/espe_frontend_zackeneule-and-nginx/tasks/main.json similarity index 67% rename from roles/espe_frontend-and-nginx/tasks/main.json rename to roles/espe_frontend_zackeneule-and-nginx/tasks/main.json index 9c32a39..75bd13b 100644 --- a/roles/espe_frontend-and-nginx/tasks/main.json +++ b/roles/espe_frontend_zackeneule-and-nginx/tasks/main.json @@ -12,7 +12,7 @@ "become": true, "ansible.builtin.template": { "src": "conf.j2", - "dest": "/etc/nginx/sites-available/{{var_espe_frontend_and_nginx_domain}}" + "dest": "/etc/nginx/sites-available/{{var_espe_frontend_zackeneule_and_nginx_domain}}" } }, { @@ -20,8 +20,8 @@ "become": true, "ansible.builtin.file": { "state": "link", - "src": "/etc/nginx/sites-available/{{var_espe_frontend_and_nginx_domain}}", - "dest": "/etc/nginx/sites-enabled/{{var_espe_frontend_and_nginx_domain}}" + "src": "/etc/nginx/sites-available/{{var_espe_frontend_zackeneule_and_nginx_domain}}", + "dest": "/etc/nginx/sites-enabled/{{var_espe_frontend_zackeneule_and_nginx_domain}}" } }, { diff --git a/roles/espe_frontend_zackeneule-and-nginx/templates/conf.j2 b/roles/espe_frontend_zackeneule-and-nginx/templates/conf.j2 new file mode 100644 index 0000000..4ce6796 --- /dev/null +++ b/roles/espe_frontend_zackeneule-and-nginx/templates/conf.j2 @@ -0,0 +1,16 @@ +server { + server_name {{var_espe_frontend_zackeneule_and_nginx_domain}}; + + listen 80; + listen [::]:80; +{% if var_espe_frontend_zackeneule_and_nginx_tls %} + listen [::]:443 ssl http2; + listen 443 ssl http2; + + ssl_certificate /etc/ssl/certs/{{var_espe_frontend_zackeneule_and_nginx_domain}}.pem; + ssl_certificate_key /etc/ssl/private/{{var_espe_frontend_zackeneule_and_nginx_domain}}.pem; + include /etc/nginx/ssl-hardening.conf; +{% endif %} + + root {{var_espe_frontend_zackeneule_and_nginx_directory}}; +} diff --git a/roles/espe_frontend_zackeneule/defaults/main.json b/roles/espe_frontend_zackeneule/defaults/main.json new file mode 100644 index 0000000..6ce7a5f --- /dev/null +++ b/roles/espe_frontend_zackeneule/defaults/main.json @@ -0,0 +1,12 @@ +{ + "var_espe_frontend_zackeneule_git_reference": "master", + "var_espe_frontend_zackeneule_directory": "/opt/zackeneule", + "var_espe_frontend_zackeneule_user": "root", + "var_espe_frontend_zackeneule_title": "Zackeneule", + "var_espe_frontend_zackeneule_backend_scheme": "https", + "var_espe_frontend_zackeneule_backend_host": "espe.example.org", + "var_espe_frontend_zackeneule_backend_port": 4916, + "var_espe_frontend_zackeneule_backend_path_base": "", + "var_espe_frontend_zackeneule_registration_default_email_address": "both", + "var_espe_frontend_zackeneule_registration_default_email_redirect": true +} diff --git a/roles/espe_frontend/tasks/main.json b/roles/espe_frontend_zackeneule/tasks/main.json similarity index 67% rename from roles/espe_frontend/tasks/main.json rename to roles/espe_frontend_zackeneule/tasks/main.json index 7f82c8a..0187bc5 100644 --- a/roles/espe_frontend/tasks/main.json +++ b/roles/espe_frontend_zackeneule/tasks/main.json @@ -16,14 +16,14 @@ "become": true, "ansible.builtin.file": { "state": "directory", - "owner": "{{var_espe_frontend_user}}" + "owner": "{{var_espe_frontend_zackeneule_user}}" } }, { "name": "program | fetch", "ansible.builtin.git": { "repo": "https://gitlab.die-linke.cloud/espe/frontend", - "version": "{{var_espe_frontend_git_reference}}", + "version": "{{var_espe_frontend_zackeneule_git_reference}}", "dest": "/tmp/espe-frontend-repo" } }, @@ -38,7 +38,7 @@ "name": "program | deploy", "become": true, "ansible.builtin.shell": { - "cmd": "cp --recursive --update /tmp/espe-frontend-repo/build/* {{var_espe_frontend_directory}}/ && chown --recursive {{var_espe_frontend_user}} {{var_espe_frontend_directory}}" + "cmd": "cp --recursive --update /tmp/espe-frontend-repo/build/* {{var_espe_frontend_zackeneule_directory}}/ && chown --recursive {{var_espe_frontend_zackeneule_user}} {{var_espe_frontend_zackeneule_directory}}" } }, { @@ -46,8 +46,8 @@ "become": true, "ansible.builtin.template": { "src": "conf.json.j2", - "dest": "{{var_espe_frontend_directory}}/conf.json", - "owner": "{{var_espe_frontend_user}}" + "dest": "{{var_espe_frontend_zackeneule_directory}}/conf.json", + "owner": "{{var_espe_frontend_zackeneule_user}}" } } ] diff --git a/roles/espe_frontend_zackeneule/templates/conf.json.j2 b/roles/espe_frontend_zackeneule/templates/conf.json.j2 new file mode 100644 index 0000000..1c92909 --- /dev/null +++ b/roles/espe_frontend_zackeneule/templates/conf.json.j2 @@ -0,0 +1,15 @@ +{ + "backend": { + "scheme": "{{var_espe_frontend_zackeneule_backend_scheme}}", + "host": "{{var_espe_frontend_zackeneule_backend_host}}", + "port": {{var_espe_frontend_zackeneule_backend_port | string}}, + "path_base": "{{var_espe_frontend_zackeneule_backend_path_base}}" + }, + "settings" : { + "title": "{{var_espe_frontend_zackeneule_title}}", + "registration_defaults": { + "email_address": "{{var_espe_frontend_zackeneule_registration_default_email_address}}", + "email_redirect": {{var_espe_frontend_zackeneule_registration_default_email_redirect | to_json}}" + } + } +} diff --git a/roles/espe_frontend/vardef.json b/roles/espe_frontend_zackeneule/vardef.json similarity index 100% rename from roles/espe_frontend/vardef.json rename to roles/espe_frontend_zackeneule/vardef.json