zeitbild/infrastructure
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zeitbild:2cbc596566bcef0c6ebb9faa163842cb94f20f06
Branches Tags
zeitbild:main
..
compare: zeitbild:70ae8293bcf95ff3a8eba867ca7b43cf5bf168f5
Branches Tags
zeitbild:main

No commits in common. "2cbc596566bcef0c6ebb9faa163842cb94f20f06" and "70ae8293bcf95ff3a8eba867ca7b43cf5bf168f5" have entirely different histories.
2cbc596566 ... 70ae8293bc

13 changed files with 19 additions and 44 deletions
Show stats Expand all files Collapse all files

10
roles/authelia-for-zeitbild_backend/tasks/main.json
View file

@ -1,18 +1,10 @@
[
{
"name": "configuration | compute client secret hash",
"become": true,
"ansible.builtin.shell": {
"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_zeitbild_backend_client_secret}} | cut --delimiter=' ' --fields='2-'"
},
"register": "temp_authelia_for_zeitbild_backend_client_secret_hashed"
},
{
"name": "configuration | emplace",
"become": true,
"ansible.builtin.template": {
"src": "authelia-client-conf.json.j2",
"dest": "/etc/authelia/conf.d/clients/zeitbild.json"
"dest": "/etc/authelia/conf.d/clients/zeitbild_backend.json"
}
},
{

6
roles/authelia-for-zeitbild_backend/templates/authelia-client-conf.json.j2
View file

@ -1,11 +1,11 @@
{
"client_id": "{{var_authelia_for_zeitbild_backend_client_id}}",
"client_secret": "{{temp_authelia_for_zeitbild_backend_client_secret_hashed.stdout}}",
"client_name": "Zeitbild",
"client_secret": "{{var_authelia_for_zeitbild_backend_client_secret}}",
"client_name": "Forgejo",
"public": false,
"authorization_policy": "one_factor",
"redirect_uris": [
"{{var_authelia_for_zeitbild_backend_zeitbild_backend_url_base}}/session/oidc"
"{{var_authelia_for_zeitbild_backend_zeitbild_backend_url_base}}/user/oauth2/authelia/callback"
],
"scopes": [
"openid",

1
roles/postgresql-for-zeitbild_backend/defaults/main.json
View file

@ -2,7 +2,6 @@
"var_postgresql_for_zeitbild_username": "zeitbild_user",
"var_postgresql_for_zeitbild_password": "REPLACE_ME",
"var_postgresql_for_zeitbild_schema": "zeitbild",
"var_postgresql_for_zeitbild_git_repository_url": "https://forgejo.linke.sx/zeitbild/datamodel",
"var_postgresql_for_zeitbild_git_reference": "master",
"var_postgresql_for_zeitbild_revision": "."
}

2
roles/postgresql-for-zeitbild_backend/tasks/main.json
View file

@ -50,7 +50,7 @@
"name": "structure | fetch",
"delegate_to": "localhost",
"ansible.builtin.git": {
"repo": "{{var_postgresql_for_zeitbild_git_repository_url}}",
"repo": "https://forgejo.linke.sx/zeitbild/datamodel",
"version": "{{var_postgresql_for_zeitbild_git_reference}}",
"dest": "/tmp/zeitbild-datamodel-repo"
}

4
roles/postgresql-for-zeitbild_backend/vardef.json
View file

@ -11,10 +11,6 @@
"type": "string",
"mandatory": false
},
"git_repository_url": {
"type": "string",
"mandatory": false
},
"git_reference": {
"type": "string",
"mandatory": false

1
roles/zeitbild_backend-and-nginx/templates/conf.j2
View file

@ -34,4 +34,3 @@ server {
{{ zeitbild_backend_common() }}
}
{% endif %}

3
roles/zeitbild_backend/defaults/main.json
View file

@ -1,8 +1,7 @@
{
"var_zeitbild_backend_directory": "/opt/zeitbild",
"var_zeitbild_backend_user": "zeitbild",
"var_zeitbild_backend_git_repository_url": "https://forgejo.linke.sx/zeitbild/backend",
"var_zeitbild_backend_git_reference": "main",
"var_zeitbild_backend_git_reference": "master",
"var_zeitbild_backend_verbosity": "notice",
"var_zeitbild_backend_address": "::",
"var_zeitbild_backend_port": 7845,

2
roles/zeitbild_backend/tasks/main.json
View file

@ -26,7 +26,7 @@
"become": true,
"become_user": "{{var_zeitbild_backend_user}}",
"ansible.builtin.git": {
"repo": "{{var_zeitbild_backend_git_repository_url}}",
"repo": "https://forgejo.linke.sx/zeitbild/backend",
"version": "{{var_zeitbild_backend_git_reference}}",
"dest": "/tmp/zeitbild-backend-repo"
}

10
roles/zeitbild_backend/templates/conf.json.j2
View file

@ -9,7 +9,7 @@
}
],
"server": {
"address": "{{var_zeitbild_backend_address}}",
"address": {{var_zeitbild_backend_address}},
"port": {{var_zeitbild_backend_port | string}}
},
{% if var_zeitbild_backend_database_kind == 'sqlite' %}
@ -24,10 +24,10 @@
"database": {
"kind": "postgresql",
"data": {
"host": "{{var_zeitbild_backend_database_data_postgresql_host}}",
"port": {{var_zeitbild_backend_database_data_postgresql_port | string}},
"host": "{{var_zeitbild_backend_database_data_postgresql_host}}"
"port": "{{var_zeitbild_backend_database_data_postgresql_port | string}}",
"username": "{{var_zeitbild_backend_database_data_postgresql_username}}",
"password": "{{var_zeitbild_backend_database_data_postgresql_password}}",
"password": "{{var_zeitbild_backend_database_data_postgresql_password}}"
"schema": "{{var_zeitbild_backend_database_data_postgresql_schema}}"
}
},
@ -48,7 +48,7 @@
"client_id": "{{var_zeitbild_backend_authentication_data_authelia_client_id}}",
"client_secret": "{{var_zeitbild_backend_authentication_data_authelia_client_secret}}",
"backend_url_base": "{{var_zeitbild_backend_authentication_data_authelia_backend_url_base}}",
"label": "{{var_zeitbild_backend_authentication_data_authelia_label}}"
"label": "{{var_zeitbild_backend_authentication_data_authelia_provider_name}}"
}
},
{% endif %}

6
roles/zeitbild_backend/vardef.json
View file

@ -7,10 +7,6 @@
"type": "string",
"mandatory": false
},
"git_repository_url": {
"type": "string",
"mandatory": false
},
"git_reference": {
"type": "string",
"mandatory": false
@ -88,5 +84,5 @@
"authentication_data_authelia_label": {
"type": "string",
"mandatory": false
}
},
}

3
roles/zeitbild_frontend_dali/defaults/main.json
View file

@ -1,6 +1,5 @@
{
"var_zeitbild_frontend_dali_git_repository_url": "https://forgejo.linke.sx/zeitbild/frontend-dali",
"var_zeitbild_frontend_dali_git_reference": "main",
"var_zeitbild_frontend_dali_git_reference": "master",
"var_zeitbild_frontend_dali_directory": "/opt/dali",
"var_zeitbild_frontend_dali_user": "dali",
"var_zeitbild_frontend_dali_title": "Dali",

11
roles/zeitbild_frontend_dali/tasks/main.json
View file

@ -11,12 +11,11 @@
}
},
{
"name": "user and directory",
"name": "directory",
"become": true,
"ansible.builtin.user": {
"name": "{{var_zeitbild_frontend_dali_user}}",
"create_home": true,
"home": "{{var_zeitbild_frontend_dali_directory}}"
"ansible.builtin.file": {
"state": "directory",
"owner": "{{var_zeitbild_frontend_dali_user}}"
}
},
{
@ -24,7 +23,7 @@
"become": true,
"become_user": "{{var_zeitbild_frontend_dali_user}}",
"ansible.builtin.git": {
"repo": "{{var_zeitbild_frontend_dali_git_repository_url}}",
"repo": "https://forgejo.linke.sx/zeitbild/frontend",
"version": "{{var_zeitbild_frontend_dali_git_reference}}",
"dest": "/tmp/dali-repo"
}

4
roles/zeitbild_frontend_dali/vardef.json
View file

@ -3,10 +3,6 @@
"type": "string",
"mandatory": false
},
"git_repository_url": {
"type": "string",
"mandatory": false
},
"directory": {
"type": "string",
"mandatory": false