diff --git a/inventory/host_vars/git1.dmz.mateu.be.yml b/inventory/host_vars/git1.dmz.mateu.be.yml index c7f4b66..fd3024c 100644 --- a/inventory/host_vars/git1.dmz.mateu.be.yml +++ b/inventory/host_vars/git1.dmz.mateu.be.yml @@ -3,7 +3,7 @@ web_hostname: - host: giteu.be -gitea_database_passwd: !vault | +gitea_pg_password: !vault | $ANSIBLE_VAULT;1.1;AES256 35653363613231623934393565656662643535663762306535316466336137633634373865333262 3763633438386533393464623663323732383238376464620a333334383932663630326137613537 diff --git a/roles/gitea/tasks/db.yml b/roles/gitea/tasks/db.yml new file mode 100644 index 0000000..49b28b9 --- /dev/null +++ b/roles/gitea/tasks/db.yml @@ -0,0 +1,15 @@ +--- + +- name: Create gitea db role + become_user: postgres + become: true + community.postgresql.postgresql_user: + name: "{{ gitea_pg_role }}" + password: "{{ gitea_pg_password }}" + +- name: Create gitea db + become_user: postgres + become: true + community.postgresql.postgresql_db: + name: "{{ gitea_pg_database }}" + owner: "{{ gitea_pg_role }}" diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml index 5cac424..d4e5a0f 100644 --- a/roles/gitea/tasks/main.yml +++ b/roles/gitea/tasks/main.yml @@ -1,5 +1,8 @@ --- +- name: Init db + ansible.builtin.include_tasks: db.yml + - name: Install prerequisites ansible.builtin.package: name: git diff --git a/roles/gitea/templates/app.ini.j2 b/roles/gitea/templates/app.ini.j2 index 9e40876..14e81e3 100644 --- a/roles/gitea/templates/app.ini.j2 +++ b/roles/gitea/templates/app.ini.j2 @@ -6,9 +6,9 @@ RUN_MODE = prod [database] DB_TYPE = postgres HOST = 127.0.0.1:5432 -NAME = giteadb -USER = gitea -PASSWD = {{ gitea_database_passwd }} +NAME = {{ gitea_pg_database }} +USER = {{ gitea_pg_role }} +PASSWD = {{ gitea_pg_password }} SCHEMA = SSL_MODE = disable PATH = /srv/gitea/data/gitea.db diff --git a/roles/gitea/vars/main.yml b/roles/gitea/vars/main.yml index f2e5619..3be9dbc 100644 --- a/roles/gitea/vars/main.yml +++ b/roles/gitea/vars/main.yml @@ -5,3 +5,6 @@ gitea_url: "https://dl.gitea.com/gitea/{{ gitea_version }}/gitea-{{ gitea_versio gitea_bin: "/usr/local/bin/gitea" gitea_path: "/srv/gitea" gitea_etc_path: "/etc/gitea" + +gitea_pg_role: "gitea" +gitea_pg_database: "giteadb"