From f97ec1816c41b9a15a37f69ef7a5a16a1c01627e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 22 Nov 2022 21:43:47 +0100 Subject: rename postfix/simple to postfix/base --- dan/sk-cloudio.yml | 2 +- dan/sk-tomnext-nc.yml | 2 +- inventory/host_vars/sk-cloudio/nextcloud.yml | 10 +++++----- inventory/host_vars/sk-cloudio/vars.yml | 4 ++-- inventory/host_vars/sk-tomnext-nc.yml | 4 ++-- roles/postfix/base/defaults/main.yml | 18 ++++++++++++++++++ roles/postfix/base/handlers/main.yml | 5 +++++ roles/postfix/base/tasks/main.yml | 22 ++++++++++++++++++++++ roles/postfix/simple/defaults/main.yml | 18 ------------------ roles/postfix/simple/handlers/main.yml | 5 ----- roles/postfix/simple/tasks/main.yml | 22 ---------------------- 11 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 roles/postfix/base/defaults/main.yml create mode 100644 roles/postfix/base/handlers/main.yml create mode 100644 roles/postfix/base/tasks/main.yml delete mode 100644 roles/postfix/simple/defaults/main.yml delete mode 100644 roles/postfix/simple/handlers/main.yml delete mode 100644 roles/postfix/simple/tasks/main.yml diff --git a/dan/sk-cloudio.yml b/dan/sk-cloudio.yml index 629b739a..732d4798 100644 --- a/dan/sk-cloudio.yml +++ b/dan/sk-cloudio.yml @@ -15,7 +15,7 @@ - role: kubernetes/standalone/base - role: acmetool/base - role: nginx/base - - role: postfix/simple + - role: postfix/base - role: apps/nextcloud - role: apps/collabora/code - role: apps/onlyoffice diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml index ff6abf14..9e5bbe37 100644 --- a/dan/sk-tomnext-nc.yml +++ b/dan/sk-tomnext-nc.yml @@ -14,7 +14,7 @@ - role: kubernetes/standalone/base - role: acmetool/base - role: nginx/base - - role: postfix/simple + - role: postfix/base - role: apps/nextcloud - role: apps/collabora/code - role: apps/onlyoffice diff --git a/inventory/host_vars/sk-cloudio/nextcloud.yml b/inventory/host_vars/sk-cloudio/nextcloud.yml index 5e3b633a..c0efab24 100644 --- a/inventory/host_vars/sk-cloudio/nextcloud.yml +++ b/inventory/host_vars/sk-cloudio/nextcloud.yml @@ -8,7 +8,7 @@ nextcloud_zfs: nextcloud_instances: wolke.elevate.at: # new: true - version: 24.0.5 + version: 25.0.1 port: 8100 hostnames: - wolke.elevate.at @@ -20,19 +20,19 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['wolke.elevate.at'] }}" insomnia.skillz.biz: # new: true - version: 24.0.5 + version: 25.0.1 port: 8101 hostnames: - insomnia.skillz.biz zfs_properties: - quota: 200G + quota: 300G database: type: mariadb version: 10.5.13 password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}" nc.skillz.biz: # new: true - version: 24.0.5 + version: 25.0.1 port: 8102 hostnames: - nc.skillz.biz @@ -44,7 +44,7 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}" wae.elevate.at: # new: true - version: 24.0.5 + version: 25.0.1 port: 8104 hostnames: - wae.elevate.at diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml index 25796113..1ba308a6 100644 --- a/inventory/host_vars/sk-cloudio/vars.yml +++ b/inventory/host_vars/sk-cloudio/vars.yml @@ -76,12 +76,12 @@ kubernetes_standalone_cni_variant: with-portmap kubernetes_standalone_local_services_tcp: - 25 -postfix_simple_mynetworks: +postfix_base_mynetworks: - "127.0.0.0/8" - "[::ffff:127.0.0.0]/104" - "[::1]/128" - "{{ kubernetes_standalone_pod_cidr }}" -postfix_simple_inet_protocols: +postfix_base_inet_protocols: - "ipv4" diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index f325f0db..79ee582f 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -91,7 +91,7 @@ kubernetes_standalone_cni_variant: with-portmap kubernetes_standalone_local_services_tcp: - 25 -postfix_simple_mynetworks: +postfix_base_mynetworks: - "127.0.0.0/8" - "[::ffff:127.0.0.0]/104" - "[::1]/128" @@ -111,7 +111,7 @@ nextcloud_zfs: nextcloud_instances: team.tomwaitz.eu: # new: true - version: 24.0.5 + version: 24.0.7 port: 8100 hostnames: - team.tomwaitz.eu diff --git a/roles/postfix/base/defaults/main.yml b/roles/postfix/base/defaults/main.yml new file mode 100644 index 00000000..a0c85d46 --- /dev/null +++ b/roles/postfix/base/defaults/main.yml @@ -0,0 +1,18 @@ +--- +postfix_base_mydestination: + - "$myhostname" + - "{{ host_name }}.{{ host_domain }}" + - "localhost" + +postfix_base_mynetworks: + - "127.0.0.0/8" + - "[::ffff:127.0.0.0]/104" + - "[::1]/128" + +postfix_base_inet_interfaces: + - "loopback-only" + +postfix_base_inet_protocols: + - "all" + +postfix_base_relayhost: "" diff --git a/roles/postfix/base/handlers/main.yml b/roles/postfix/base/handlers/main.yml new file mode 100644 index 00000000..bea754c9 --- /dev/null +++ b/roles/postfix/base/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart postfix + service: + name: postfix + state: restarted diff --git a/roles/postfix/base/tasks/main.yml b/roles/postfix/base/tasks/main.yml new file mode 100644 index 00000000..8cb55fe0 --- /dev/null +++ b/roles/postfix/base/tasks/main.yml @@ -0,0 +1,22 @@ +--- +- name: install postfix package + apt: + name: postfix + state: present + +- name: basic postfix options + vars: + postfix_options: + mydestination: "{{ postfix_base_mydestination | join(', ') }}" + mynetworks: "{{ postfix_base_mynetworks | join(', ') }}" + relayhost: "{{ postfix_base_relayhost }}" + inet_interfaces: "{{ postfix_base_inet_interfaces | join(', ') }}" + inet_protocols: "{{ postfix_base_inet_protocols | join(', ') }}" + loop: "{{ postfix_options | dict2items }}" + loop_control: + label: "{{ item.key }} = {{ item.value }}" + lineinfile: + regexp: "^#?\\s*{{ item.key }}\\s*=" + line: "{{ item.key }} = {{ item.value }}" + dest: /etc/postfix/main.cf + notify: restart postfix diff --git a/roles/postfix/simple/defaults/main.yml b/roles/postfix/simple/defaults/main.yml deleted file mode 100644 index f849b61b..00000000 --- a/roles/postfix/simple/defaults/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -postfix_simple_mydestination: - - "$myhostname" - - "{{ host_name }}.{{ host_domain }}" - - "localhost" - -postfix_simple_mynetworks: - - "127.0.0.0/8" - - "[::ffff:127.0.0.0]/104" - - "[::1]/128" - -postfix_simple_inet_interfaces: - - "loopback-only" - -postfix_simple_inet_protocols: - - "all" - -postfix_simple_relayhost: "" diff --git a/roles/postfix/simple/handlers/main.yml b/roles/postfix/simple/handlers/main.yml deleted file mode 100644 index bea754c9..00000000 --- a/roles/postfix/simple/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: restart postfix - service: - name: postfix - state: restarted diff --git a/roles/postfix/simple/tasks/main.yml b/roles/postfix/simple/tasks/main.yml deleted file mode 100644 index 4309c3ac..00000000 --- a/roles/postfix/simple/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: install postfix package - apt: - name: postfix - state: present - -- name: basic postfix options - vars: - postfix_options: - mydestination: "{{ postfix_simple_mydestination | join(', ') }}" - mynetworks: "{{ postfix_simple_mynetworks | join(', ') }}" - relayhost: "{{ postfix_simple_relayhost }}" - inet_interfaces: "{{ postfix_simple_inet_interfaces | join(', ') }}" - inet_protocols: "{{ postfix_simple_inet_protocols | join(', ') }}" - loop: "{{ postfix_options | dict2items }}" - loop_control: - label: "{{ item.key }} = {{ item.value }}" - lineinfile: - regexp: "^#?\\s*{{ item.key }}\\s*=" - line: "{{ item.key }} = {{ item.value }}" - dest: /etc/postfix/main.cf - notify: restart postfix -- cgit v1.2.3