From 4ffae172553a86d810b2bd81cf9538849b49f601 Mon Sep 17 00:00:00 2001 From: Salt Date: Sun, 2 Aug 2020 19:46:12 -0500 Subject: [PATCH] Reorganize pleroma vars --- inventory/group_vars/9iron.club.yml | 70 +++++++++++++++-------------- roles/pleroma/defaults/main.yml | 2 +- roles/pleroma/tasks/main.yml | 6 +-- roles/pleroma/templates/config.exs | 16 +++---- 4 files changed, 49 insertions(+), 45 deletions(-) diff --git a/inventory/group_vars/9iron.club.yml b/inventory/group_vars/9iron.club.yml index 609fd67..87e5ae5 100644 --- a/inventory/group_vars/9iron.club.yml +++ b/inventory/group_vars/9iron.club.yml @@ -109,39 +109,43 @@ nextcloud: 61373135303632336237333836353764646639633735323566346366623766646266 url: "nc.9iron.club" # Pleroma -pleroma_instance_desc: owo -pleroma_instance_email: rehashedsalt@cock.li -pleroma_instance_name: Cowfee -pleroma_instance_notify_email: noreply@cowfee.moe -pleroma_openreg: "true" -pleroma_static_repo: "https://git.9iron.club/salt/pleroma" -pleroma_db_password: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 34343838386134656236313462653531663839363030333630383332386535356431326436633137 - 3261323632653635383930333131333235373437653733300a363562666264616138623832666137 - 61333039646332343838346633363035343434303036643465353062353062303961383138643564 - 3338393765393733340a626436653666363236643938613466643530326665653764333933393437 - 37613033653864643965323162373366306233626235663461326266376662663634353066386139 - 37636162313364623933396232366239633338363539626637373163333130373665373038363566 - 65646633636638653335356536323334646632366164633532636634376632356166306139393766 - 38633934623639366263 -pleroma_secret_key_base: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 36333934336635613533333137636532363937613764353933636566663031316262333837323064 - 6534653062626461633462636335346132353564653038330a326330326235623530393337333063 - 37666666386637633839633737376465366439356461653363396665636137353264363762346461 - 3765616634653234630a623061393834373964653939626564363263383435666366356339663136 - 64613330656434653538363734393831353133316666326338366335383064356165333537383837 - 31633939353565303661626233623064653838636435376239376361663362636164653962383561 - 33366335623038653232613731333730363836653532363834663663343963303763323534343038 - 61666238346239636634 -pleroma_signing_salt: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 31306137646362333433313630363538333234643339353530333038393061663132633161356231 - 3662386234633933633762363334333031306564353132380a633339323364633137396636616363 - 64393536353362386336323662316262333763326138616364333237353262323232636335353436 - 3563396435643363620a646337346561393863366361643536356363626334343264343861663131 - 3466 +pleroma: + instance: + name: Cowfee + desc: owo + email: rehashedsalt@cock.li + notify_email: noreply@cowfee.moe + openreg: "true" + static_repo: "https://git.9iron.club/salt/pleroma" + db: + pass: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 34343838386134656236313462653531663839363030333630383332386535356431326436633137 + 3261323632653635383930333131333235373437653733300a363562666264616138623832666137 + 61333039646332343838346633363035343434303036643465353062353062303961383138643564 + 3338393765393733340a626436653666363236643938613466643530326665653764333933393437 + 37613033653864643965323162373366306233626235663461326266376662663634353066386139 + 37636162313364623933396232366239633338363539626637373163333130373665373038363566 + 65646633636638653335356536323334646632366164633532636634376632356166306139393766 + 38633934623639366263 + secret: + key_base: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 36333934336635613533333137636532363937613764353933636566663031316262333837323064 + 6534653062626461633462636335346132353564653038330a326330326235623530393337333063 + 37666666386637633839633737376465366439356461653363396665636137353264363762346461 + 3765616634653234630a623061393834373964653939626564363263383435666366356339663136 + 64613330656434653538363734393831353133316666326338366335383064356165333537383837 + 31633939353565303661626233623064653838636435376239376361663362636164653962383561 + 33366335623038653232613731333730363836653532363834663663343963303763323534343038 + 61666238346239636634 + signing_salt: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 31306137646362333433313630363538333234643339353530333038393061663132633161356231 + 3662386234633933633762363334333031306564353132380a633339323364633137396636616363 + 64393536353362386336323662316262333763326138616364333237353262323232636335353436 + 3563396435643363620a646337346561393863366361643536356363626334343264343861663131 + 3466 # snmpd snmp_location: "us-east-2" snmp_contact: "Salt " diff --git a/roles/pleroma/defaults/main.yml b/roles/pleroma/defaults/main.yml index c1bd569..ccbf132 100644 --- a/roles/pleroma/defaults/main.yml +++ b/roles/pleroma/defaults/main.yml @@ -2,5 +2,5 @@ # vim:ft=ansible: pleroma_arch: amd64 pleroma_char_limit: 65535 -pleroma_openreg: false +pleroma.openreg: false pleroma_webroot: /var/www/pleroma diff --git a/roles/pleroma/tasks/main.yml b/roles/pleroma/tasks/main.yml index bd20687..57e8c4e 100644 --- a/roles/pleroma/tasks/main.yml +++ b/roles/pleroma/tasks/main.yml @@ -28,7 +28,7 @@ - name: Create DB user postgresql_user: name: pleroma - password: "{{ pleroma_db_password }}" + password: "{{ pleroma.db.pass }}" login_host: "{{ pleroma_db_hostname }}" login_user: "{{ psql.ansible.user }}" login_password: "{{ psql.ansible.pass }}" @@ -153,10 +153,10 @@ notify: restart pleroma - name: Clone static directory git: - repo: "{{ pleroma_static_repo }}" + repo: "{{ pleroma.static_repo }}" dest: "/var/lib/pleroma/static" force: yes - when: pleroma_static_repo is defined + when: pleroma.static_repo is defined become: yes become_user: pleroma - name: Migrate DB diff --git a/roles/pleroma/templates/config.exs b/roles/pleroma/templates/config.exs index e836ed8..0dc4d26 100644 --- a/roles/pleroma/templates/config.exs +++ b/roles/pleroma/templates/config.exs @@ -5,15 +5,15 @@ import Config config :pleroma, Pleroma.Web.Endpoint, url: [host: "{{ pleroma_url }}", scheme: "https", port: 443], http: [ip: {127, 0, 0, 1}, port: 4000], - secret_key_base: "{{ pleroma_secret_key_base }}", - signing_salt: "{{ pleroma_signing_salt }}" + secret_key_base: "{{ pleroma.secret.key_base }}", + signing_salt: "{{ pleroma.secret.signing_salt }}" config :pleroma, :instance, - name: "{{ pleroma_instance_name }}", - desc: "{{ pleroma_instance_desc }}", - email: "{{ pleroma_instance_email }}", - notify_email: "{{ pleroma_instance_notify_email }}", + name: "{{ pleroma.instance.name }}", + desc: "{{ pleroma.instance.desc }}", + email: "{{ pleroma.instance.email }}", + notify_email: "{{ pleroma.instance.notify_email }}", limit: "{{ pleroma_char_limit }}", - registrations_open: {{ pleroma_openreg }}, + registrations_open: {{ pleroma.openreg }}, static_dir: "/var/lib/pleroma/static" config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, @@ -28,7 +28,7 @@ config :pleroma, :media_proxy, config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, username: "pleroma", - password: "{{ pleroma_db_password }}", + password: "{{ pleroma.db.pass }}", database: "pleroma", hostname: "{{ pleroma_db_hostname }}", pool_size: 10