diff options
| -rw-r--r-- | ansible/roles/postgres/handlers/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/postgres/tasks/main.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/postgres/vars/main.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/ufw/tasks/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ufw/vars/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/wireguard/defaults/main/vars.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/wireguard/templates/wg0.conf.j2 | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/ansible/roles/postgres/handlers/main.yml b/ansible/roles/postgres/handlers/main.yml index a036301..73fffe3 100644 --- a/ansible/roles/postgres/handlers/main.yml +++ b/ansible/roles/postgres/handlers/main.yml @@ -1,4 +1,4 @@ - name: Restart postgres. service: - name: '{{ postgresql_daemon }}' + name: '{{ postgres_daemon }}' state: "restarted" diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 9551c4e..034ff9c 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -2,8 +2,8 @@ apt: name: - python3-psycopg2 - - postgresql-{{ postgresql_version }} - - postgresql-contrib-{{ postgresql_version }} + - postgresql-{{ postgres_version }} + - postgresql-contrib-{{ postgres_version }} - libpq-dev state: present tags: @@ -11,7 +11,7 @@ - name: Check postgres is started and enabled on boot service: - name: '{{ postgresql_daemon }}' + name: '{{ postgres_daemon }}' state: started enabled: true tags: @@ -19,16 +19,16 @@ - name: Add postgres users community.postgresql.postgresql_user: "{{ item }}" - with_items: "{{ postgresql_users }}" + with_items: "{{ postgres_users }}" become: true - become_user: "{{ postgresql_user }}" + become_user: "{{ postgres_user }}" tags: - role::postgres - name: Add postgres databases community.postgresql.postgresql_db: "{{ item }}" - with_items: "{{ postgresql_databases }}" + with_items: "{{ postgres_databases }}" become: true - become_user: "{{ postgresql_user }}" + become_user: "{{ postgres_user }}" tags: - role::postgres diff --git a/ansible/roles/postgres/vars/main.yml b/ansible/roles/postgres/vars/main.yml index ddb483a..7f482b0 100644 --- a/ansible/roles/postgres/vars/main.yml +++ b/ansible/roles/postgres/vars/main.yml @@ -1,7 +1,7 @@ -postgresql_version: "15" -postgresql_daemon: "postgresql@{{ postgresql_version }}-main" +postgres_version: "15" +postgres_daemon: "postgresql@{{ postgres_version }}-main" postgres_user: "postgres" -postgresql_users: [] +postgres_users: [] -postgresql_databases: [] +postgres_databases: [] diff --git a/ansible/roles/ufw/tasks/main.yml b/ansible/roles/ufw/tasks/main.yml index 1204060..89e25d9 100644 --- a/ansible/roles/ufw/tasks/main.yml +++ b/ansible/roles/ufw/tasks/main.yml @@ -32,6 +32,6 @@ - name: Apply service-specific rules community.general.ufw: "{{ item }}" - with_items: "{{ rules }}" + with_items: "{{ ufw_rules }}" tags: - role::ufw diff --git a/ansible/roles/ufw/vars/main.yml b/ansible/roles/ufw/vars/main.yml index da156e5..3c342ec 100644 --- a/ansible/roles/ufw/vars/main.yml +++ b/ansible/roles/ufw/vars/main.yml @@ -1,4 +1,4 @@ -rules: +ufw_rules: - comment: Allow internal traffic interface: wg0 direction: in diff --git a/ansible/roles/wireguard/defaults/main/vars.yml b/ansible/roles/wireguard/defaults/main/vars.yml index 10c80ae..f44e4e9 100644 --- a/ansible/roles/wireguard/defaults/main/vars.yml +++ b/ansible/roles/wireguard/defaults/main/vars.yml @@ -1,4 +1,4 @@ -extra_keys: +wireguard_extra_keys: - name: Joe pubkey: /dJ+tKXzxv7nrUleNlF+CGyq7OIVlqL8/9Sn8j+cEAc= subnet: 10.0.1.0/24 diff --git a/ansible/roles/wireguard/templates/wg0.conf.j2 b/ansible/roles/wireguard/templates/wg0.conf.j2 index 647854a..243e3c0 100644 --- a/ansible/roles/wireguard/templates/wg0.conf.j2 +++ b/ansible/roles/wireguard/templates/wg0.conf.j2 @@ -16,7 +16,7 @@ PersistentKeepalive = 30 {% endfor %} -{% for key in extra_keys %} +{% for key in wireguard_extra_keys %} # DevOps config for: {{ key.name }} [Peer] AllowedIPs = {{ key.subnet }} |