From b62031ccee0299843cbede56af542f934fa699e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Fri, 7 Jun 2024 08:23:53 +0200 Subject: [PATCH] [int] --- roles/database/defaults/main.json | 5 ---- roles/database/tasks/main.json | 23 ------------------- roles/database/vardef.json | 17 -------------- .../templates/conf.j2 | 0 .../templates/conf.j2 | 0 .../defaults/main.json | 1 + .../{backend => espe_backend}/tasks/main.json | 13 ++++++++++- .../templates/conf.json.j2 | 0 roles/{backend => espe_backend}/vardef.json | 4 ++++ .../templates/conf.j2 | 0 .../templates/conf.j2 | 0 roles/postgresql-for-espe/defaults/main.json | 2 +- roles/postgresql-for-espe/tasks/main.json | 4 ++-- 13 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 roles/database/defaults/main.json delete mode 100644 roles/database/tasks/main.json delete mode 100644 roles/database/vardef.json rename roles/{backend-and-lighttpd => espe_backend-and-lighttpd}/templates/conf.j2 (100%) rename roles/{backend-and-nginx => espe_backend-and-nginx}/templates/conf.j2 (100%) rename roles/{backend => espe_backend}/defaults/main.json (98%) rename roles/{backend => espe_backend}/tasks/main.json (71%) rename roles/{backend => espe_backend}/templates/conf.json.j2 (100%) rename roles/{backend => espe_backend}/vardef.json (98%) rename roles/{frontend-and-lighttpd => espe_frontend-and-lighttpd}/templates/conf.j2 (100%) rename roles/{frontend-and-nginx => espe_frontend-and-nginx}/templates/conf.j2 (100%) diff --git a/roles/database/defaults/main.json b/roles/database/defaults/main.json deleted file mode 100644 index 4876534..0000000 --- a/roles/database/defaults/main.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "var_linke_espe_database_git_reference": "master", - "var_linke_espe_database_revision": "r4", - "var_linke_espe_database_backup_path": null -} diff --git a/roles/database/tasks/main.json b/roles/database/tasks/main.json deleted file mode 100644 index 1553a3a..0000000 --- a/roles/database/tasks/main.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "name": "fetch", - "delegate_to": "localhost", - "ansible.builtin.git": { - "repo": "dl-cloud-gitlab:espe/backend", - "version": "{{var_linke_espe_database_git_reference}}", - "dest": "/tmp/espe-database-repo" - } - }, - { - "name": "build", - "delegate_to": "localhost", - "ansible.builtin.command": { - "chdir": "/tmp/espe-database-repo", - "cmd": "tools/build {{var_linke_espe_database_revision}} > /tmp/espe-db-init.sql" - } - }, - { - "name": "initialize", - "when": "var_linke_espe_database_backup_path == None", - } -] diff --git a/roles/database/vardef.json b/roles/database/vardef.json deleted file mode 100644 index f186c8f..0000000 --- a/roles/database/vardef.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "git_reference": { - "nullable": true, - "type": "string", - "mandatory": false - }, - "revision": { - "nullable": false, - "type": "string", - "mandatory": true - }, - "backup_path": { - "nullable": true, - "type": "string", - "mandatory": false - } -} diff --git a/roles/backend-and-lighttpd/templates/conf.j2 b/roles/espe_backend-and-lighttpd/templates/conf.j2 similarity index 100% rename from roles/backend-and-lighttpd/templates/conf.j2 rename to roles/espe_backend-and-lighttpd/templates/conf.j2 diff --git a/roles/backend-and-nginx/templates/conf.j2 b/roles/espe_backend-and-nginx/templates/conf.j2 similarity index 100% rename from roles/backend-and-nginx/templates/conf.j2 rename to roles/espe_backend-and-nginx/templates/conf.j2 diff --git a/roles/backend/defaults/main.json b/roles/espe_backend/defaults/main.json similarity index 98% rename from roles/backend/defaults/main.json rename to roles/espe_backend/defaults/main.json index 7b173c3..b29be39 100644 --- a/roles/backend/defaults/main.json +++ b/roles/espe_backend/defaults/main.json @@ -1,5 +1,6 @@ { "var_espe_backend_directory": "/opt/espe/backend", + "var_espe_backend_user": "espe", "var_espe_backend_git_reference": "master", "var_espe_backend_verbosity": "notice", "var_espe_backend_verification_secret": "REPLACE_ME", diff --git a/roles/backend/tasks/main.json b/roles/espe_backend/tasks/main.json similarity index 71% rename from roles/backend/tasks/main.json rename to roles/espe_backend/tasks/main.json index 5e5ee1e..e9bfe1f 100644 --- a/roles/backend/tasks/main.json +++ b/roles/espe_backend/tasks/main.json @@ -1,4 +1,13 @@ [ + { + "name": "user", + "become": true, + "ansible.builtin.user": { + "name": "{{var_espe_backend_user}}", + "create_home": true, + "home": "{{var_espe_backend_directory}}" + } + }, { "name": "program | fetch", "delegate_to": "localhost", @@ -26,9 +35,11 @@ }, { "name": "conf", + "become": true, "ansible.builtin.template": { "src": "conf.json.j2", - "dest": "{{var_espe_backend_directory}}/conf.json" + "dest": "{{var_espe_backend_directory}}/conf.json", + "owner": "{{var_espe_backend_user}}" } } ] diff --git a/roles/backend/templates/conf.json.j2 b/roles/espe_backend/templates/conf.json.j2 similarity index 100% rename from roles/backend/templates/conf.json.j2 rename to roles/espe_backend/templates/conf.json.j2 diff --git a/roles/backend/vardef.json b/roles/espe_backend/vardef.json similarity index 98% rename from roles/backend/vardef.json rename to roles/espe_backend/vardef.json index e432d3a..206db5b 100644 --- a/roles/backend/vardef.json +++ b/roles/espe_backend/vardef.json @@ -3,6 +3,10 @@ "type": "string", "mandatory": false }, + "user": { + "type": "string", + "mandatory": false + }, "git_reference": { "type": "string", "mandatory": false diff --git a/roles/frontend-and-lighttpd/templates/conf.j2 b/roles/espe_frontend-and-lighttpd/templates/conf.j2 similarity index 100% rename from roles/frontend-and-lighttpd/templates/conf.j2 rename to roles/espe_frontend-and-lighttpd/templates/conf.j2 diff --git a/roles/frontend-and-nginx/templates/conf.j2 b/roles/espe_frontend-and-nginx/templates/conf.j2 similarity index 100% rename from roles/frontend-and-nginx/templates/conf.j2 rename to roles/espe_frontend-and-nginx/templates/conf.j2 diff --git a/roles/postgresql-for-espe/defaults/main.json b/roles/postgresql-for-espe/defaults/main.json index 5d3a8af..730b7e0 100644 --- a/roles/postgresql-for-espe/defaults/main.json +++ b/roles/postgresql-for-espe/defaults/main.json @@ -3,5 +3,5 @@ "var_postgresql_for_espe_password": "REPLACE_ME", "var_postgresql_for_espe_schema": "espe", "var_postgresql_for_espe_git_reference": "master", - "var_postgresql_for_espe_revision": "r4" + "var_postgresql_for_espe_revision": "." } diff --git a/roles/postgresql-for-espe/tasks/main.json b/roles/postgresql-for-espe/tasks/main.json index a973557..8184f41 100644 --- a/roles/postgresql-for-espe/tasks/main.json +++ b/roles/postgresql-for-espe/tasks/main.json @@ -45,7 +45,7 @@ "privs": "ALL", "grant_option": true } - } + }, { "name": "structure | fetch", "delegate_to": "localhost", @@ -60,7 +60,7 @@ "delegate_to": "localhost", "ansible.builtin.command": { "chdir": "/tmp/espe-datamodel-repo", - "cmd": "tools/build {{var_postgresql_for_espe_revision}} database:postgresql > /tmp/espe.sql" + "cmd": "tools/build --revision='{{var_postgresql_for_espe_revision}}' --format='postgresql' > /tmp/espe.sql" } }, {