[mod] "backend" -> "core"

roles/davina_backend-and-nginx/defaults/main.json

@@ -1,5 +0,0 @@
-{
-	"var_davina_backend_and_nginx_directory": "/opt/davina",
-	"var_davina_backend_and_nginx_domain": "davina.example.org",
-	"var_davina_backend_and_nginx_tls_mode": "force"
-}

roles/davina_backend/defaults/main.json

@@ -1,7 +0,0 @@
-{
-	"var_davina_backend_directory": "/opt/davina",
-	"var_davina_backend_user": "davina",
-	"var_davina_backend_git_repository_url": "https://forgejo.ramsch.sx/misc/davina-backend",
-	"var_davina_backend_git_reference": "main",
-	"var_davina_backend_conf_realms": []
-}

roles/davina_backend/templates/conf.json.j2

@@ -1,7 +0,0 @@
-{
-	"realms": {{var_davina_backend_conf_realms | to_json}},
-	"settings": {
-		"timezone": "UTC"
-	}
-}
-

roles/davina_core-and-nginx/defaults/main.json

@@ -0,0 +1,5 @@
+{
+	"var_davina_core_and_nginx_directory": "/opt/davina",
+	"var_davina_core_and_nginx_domain": "davina.example.org",
+	"var_davina_core_and_nginx_tls_mode": "force"
+}

roles/davina_core-and-nginx/tasks/main.json

@@ -12,7 +12,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{var_davina_backend_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-available/{{var_davina_core_and_nginx_domain}}"
 		}
 	},
 	{
@@ -20,8 +20,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{var_davina_backend_and_nginx_domain}}",
+			"src": "/etc/nginx/sites-available/{{var_davina_core_and_nginx_domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_davina_backend_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{var_davina_core_and_nginx_domain}}"
 		}
 	},
 	{

roles/davina_core-and-nginx/templates/conf.j2

@@ -1,5 +1,5 @@
-{% macro davina_backend_common() %}
+{% macro davina_core_common() %}
-	root {{var_davina_backend_and_nginx_directory}};
+	root {{var_davina_core_and_nginx_directory}};
 	index index.php;
 	
 	location / {
@@ -23,26 +23,26 @@ server {
 	listen 80;
 	listen [::]:80;
 	
-	server_name {{var_davina_backend_and_nginx_domain}};
+	server_name {{var_davina_core_and_nginx_domain}};
 	
-{% if var_davina_backend_and_nginx_tls_mode == 'force' %}
+{% if var_davina_core_and_nginx_tls_mode == 'force' %}
 	return 301 https://$http_host$request_uri;
 {% else %}
-{{ davina_backend_common() }}
+{{ davina_core_common() }}
 {% endif %}
 }
 
-{% if var_davina_backend_and_nginx_tls_mode != 'disable' %}
+{% if var_davina_core_and_nginx_tls_mode != 'disable' %}
 server {
 	listen 443 ssl;
 	listen [::]:443 ssl;
 	
-	server_name {{var_davina_backend_and_nginx_domain}};
+	server_name {{var_davina_core_and_nginx_domain}};
 	
-	ssl_certificate_key /etc/ssl/private/{{var_davina_backend_and_nginx_domain}}.pem;
+	ssl_certificate_key /etc/ssl/private/{{var_davina_core_and_nginx_domain}}.pem;
-	ssl_certificate /etc/ssl/fullchains/{{var_davina_backend_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_davina_core_and_nginx_domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 	
-{{ davina_backend_common() }}
+{{ davina_core_common() }}
 }
 {% endif %}

roles/davina_core/defaults/main.json

@@ -0,0 +1,7 @@
+{
+	"var_davina_core_directory": "/opt/davina",
+	"var_davina_core_user": "davina",
+	"var_davina_core_git_repository_url": "https://forgejo.ramsch.sx/misc/davina-core",
+	"var_davina_core_git_reference": "main",
+	"var_davina_core_conf_realms": []
+}

roles/davina_core/tasks/main.json

@@ -19,9 +19,9 @@
 		"name": "user and directory",
 		"become": true,
 		"ansible.builtin.user": {
-			"name": "{{var_davina_backend_user}}",
+			"name": "{{var_davina_core_user}}",
 			"create_home": true,
-			"home": "{{var_davina_backend_directory}}"
+			"home": "{{var_davina_core_directory}}"
 		}
 	},
 	{
@@ -35,17 +35,17 @@
 	{
 		"name": "program | fetch",
 		"become": true,
-		"become_user": "{{var_davina_backend_user}}",
+		"become_user": "{{var_davina_core_user}}",
 		"ansible.builtin.git": {
-			"repo": "{{var_davina_backend_git_repository_url}}",
+			"repo": "{{var_davina_core_git_repository_url}}",
-			"version": "{{var_davina_backend_git_reference}}",
+			"version": "{{var_davina_core_git_reference}}",
 			"dest": "/tmp/davina-backend-repo"
 		}
 	},
 	{
 		"name": "program | build",
 		"become": true,
-		"become_user": "{{var_davina_backend_user}}",
+		"become_user": "{{var_davina_core_user}}",
 		"ansible.builtin.command": {
 			"chdir": "/tmp/davina-backend-repo",
 			"cmd": "tools/build"
@@ -54,10 +54,10 @@
 	{
 		"name": "program | deploy",
 		"become": true,
-		"become_user": "{{var_davina_backend_user}}",
+		"become_user": "{{var_davina_core_user}}",
 		"ansible.builtin.command": {
 			"chdir": "/tmp/davina-backend-repo",
-			"cmd": "tools/deploy localhost --target-directory={{var_davina_backend_directory}}"
+			"cmd": "tools/deploy localhost --target-directory={{var_davina_core_directory}}"
 		}
 	},
 	{
@@ -65,8 +65,8 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.json.j2",
-			"dest": "{{var_davina_backend_directory}}/conf.json",
+			"dest": "{{var_davina_core_directory}}/conf.json",
-			"owner": "{{var_davina_backend_user}}"
+			"owner": "{{var_davina_core_user}}"
 		}
 	}
 ]

roles/davina_core/templates/conf.json.j2

@@ -0,0 +1,7 @@
+{
+	"realms": {{var_davina_core_conf_realms | to_json}},
+	"settings": {
+		"timezone": "UTC"
+	}
+}
+