salt/ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reorganize pleroma vars

Browse Source
This commit is contained in:
Salt 2020-08-02 19:46:12 -05:00
parent 12d09a58bd
commit 4ffae17255
4 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
inventory/group_vars/9iron.club.yml
View File

@ -109,39 +109,43 @@ nextcloud:
61373135303632336237333836353764646639633735323566346366623766646266 61373135303632336237333836353764646639633735323566346366623766646266
url: "nc.9iron.club" url: "nc.9iron.club"
# Pleroma # Pleroma
pleroma_instance_desc: owo pleroma:
pleroma_instance_email: rehashedsalt@cock.li instance:
pleroma_instance_name: Cowfee name: Cowfee
pleroma_instance_notify_email: noreply@cowfee.moe desc: owo
pleroma_openreg: "true" email: rehashedsalt@cock.li
pleroma_static_repo: "https://git.9iron.club/salt/pleroma" notify_email: noreply@cowfee.moe
pleroma_db_password: !vault | openreg: "true"
$ANSIBLE_VAULT;1.1;AES256 static_repo: "https://git.9iron.club/salt/pleroma"
34343838386134656236313462653531663839363030333630383332386535356431326436633137 db:
3261323632653635383930333131333235373437653733300a363562666264616138623832666137 pass: !vault |
61333039646332343838346633363035343434303036643465353062353062303961383138643564 $ANSIBLE_VAULT;1.1;AES256
3338393765393733340a626436653666363236643938613466643530326665653764333933393437 34343838386134656236313462653531663839363030333630383332386535356431326436633137
37613033653864643965323162373366306233626235663461326266376662663634353066386139 3261323632653635383930333131333235373437653733300a363562666264616138623832666137
37636162313364623933396232366239633338363539626637373163333130373665373038363566 61333039646332343838346633363035343434303036643465353062353062303961383138643564
65646633636638653335356536323334646632366164633532636634376632356166306139393766 3338393765393733340a626436653666363236643938613466643530326665653764333933393437
38633934623639366263 37613033653864643965323162373366306233626235663461326266376662663634353066386139
pleroma_secret_key_base: !vault | 37636162313364623933396232366239633338363539626637373163333130373665373038363566
$ANSIBLE_VAULT;1.1;AES256 65646633636638653335356536323334646632366164633532636634376632356166306139393766
36333934336635613533333137636532363937613764353933636566663031316262333837323064 38633934623639366263
6534653062626461633462636335346132353564653038330a326330326235623530393337333063 secret:
37666666386637633839633737376465366439356461653363396665636137353264363762346461 key_base: !vault |
3765616634653234630a623061393834373964653939626564363263383435666366356339663136 $ANSIBLE_VAULT;1.1;AES256
64613330656434653538363734393831353133316666326338366335383064356165333537383837 36333934336635613533333137636532363937613764353933636566663031316262333837323064
31633939353565303661626233623064653838636435376239376361663362636164653962383561 6534653062626461633462636335346132353564653038330a326330326235623530393337333063
33366335623038653232613731333730363836653532363834663663343963303763323534343038 37666666386637633839633737376465366439356461653363396665636137353264363762346461
61666238346239636634 3765616634653234630a623061393834373964653939626564363263383435666366356339663136
pleroma_signing_salt: !vault | 64613330656434653538363734393831353133316666326338366335383064356165333537383837
$ANSIBLE_VAULT;1.1;AES256 31633939353565303661626233623064653838636435376239376361663362636164653962383561
31306137646362333433313630363538333234643339353530333038393061663132633161356231 33366335623038653232613731333730363836653532363834663663343963303763323534343038
3662386234633933633762363334333031306564353132380a633339323364633137396636616363 61666238346239636634
64393536353362386336323662316262333763326138616364333237353262323232636335353436 signing_salt: !vault |
3563396435643363620a646337346561393863366361643536356363626334343264343861663131 $ANSIBLE_VAULT;1.1;AES256
3466 31306137646362333433313630363538333234643339353530333038393061663132633161356231
3662386234633933633762363334333031306564353132380a633339323364633137396636616363
64393536353362386336323662316262333763326138616364333237353262323232636335353436
3563396435643363620a646337346561393863366361643536356363626334343264343861663131
3466
# snmpd # snmpd
snmp_location: "us-east-2" snmp_location: "us-east-2"
snmp_contact: "Salt <rehashedsalt@cock.li>" snmp_contact: "Salt <rehashedsalt@cock.li>"

2
roles/pleroma/defaults/main.yml
View File

@ -2,5 +2,5 @@
# vim:ft=ansible: # vim:ft=ansible:
pleroma_arch: amd64 pleroma_arch: amd64
pleroma_char_limit: 65535 pleroma_char_limit: 65535
pleroma_openreg: false pleroma.openreg: false
pleroma_webroot: /var/www/pleroma pleroma_webroot: /var/www/pleroma

6
roles/pleroma/tasks/main.yml
View File

@ -28,7 +28,7 @@
- name: Create DB user - name: Create DB user
postgresql_user: postgresql_user:
name: pleroma name: pleroma
password: "{{ pleroma_db_password }}" password: "{{ pleroma.db.pass }}"
login_host: "{{ pleroma_db_hostname }}" login_host: "{{ pleroma_db_hostname }}"
login_user: "{{ psql.ansible.user }}" login_user: "{{ psql.ansible.user }}"
login_password: "{{ psql.ansible.pass }}" login_password: "{{ psql.ansible.pass }}"
@ -153,10 +153,10 @@
notify: restart pleroma notify: restart pleroma
- name: Clone static directory - name: Clone static directory
git: git:
repo: "{{ pleroma_static_repo }}" repo: "{{ pleroma.static_repo }}"
dest: "/var/lib/pleroma/static" dest: "/var/lib/pleroma/static"
force: yes force: yes
when: pleroma_static_repo is defined when: pleroma.static_repo is defined
become: yes become: yes
become_user: pleroma become_user: pleroma
- name: Migrate DB - name: Migrate DB

16
roles/pleroma/templates/config.exs
View File

@ -5,15 +5,15 @@ import Config
config :pleroma, Pleroma.Web.Endpoint, config :pleroma, Pleroma.Web.Endpoint,
url: [host: "{{ pleroma_url }}", scheme: "https", port: 443], url: [host: "{{ pleroma_url }}", scheme: "https", port: 443],
http: [ip: {127, 0, 0, 1}, port: 4000], http: [ip: {127, 0, 0, 1}, port: 4000],
secret_key_base: "{{ pleroma_secret_key_base }}", secret_key_base: "{{ pleroma.secret.key_base }}",
signing_salt: "{{ pleroma_signing_salt }}" signing_salt: "{{ pleroma.secret.signing_salt }}"
config :pleroma, :instance, config :pleroma, :instance,
name: "{{ pleroma_instance_name }}", name: "{{ pleroma.instance.name }}",
desc: "{{ pleroma_instance_desc }}", desc: "{{ pleroma.instance.desc }}",
email: "{{ pleroma_instance_email }}", email: "{{ pleroma.instance.email }}",
notify_email: "{{ pleroma_instance_notify_email }}", notify_email: "{{ pleroma.instance.notify_email }}",
limit: "{{ pleroma_char_limit }}", limit: "{{ pleroma_char_limit }}",
registrations_open: {{ pleroma_openreg }}, registrations_open: {{ pleroma.openreg }},
static_dir: "/var/lib/pleroma/static" static_dir: "/var/lib/pleroma/static"
config :pleroma, Pleroma.Upload, config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local, uploader: Pleroma.Uploaders.Local,
@ -28,7 +28,7 @@ config :pleroma, :media_proxy,
config :pleroma, Pleroma.Repo, config :pleroma, Pleroma.Repo,
adapter: Ecto.Adapters.Postgres, adapter: Ecto.Adapters.Postgres,
username: "pleroma", username: "pleroma",
password: "{{ pleroma_db_password }}", password: "{{ pleroma.db.pass }}",
database: "pleroma", database: "pleroma",
hostname: "{{ pleroma_db_hostname }}", hostname: "{{ pleroma_db_hostname }}",
pool_size: 10 pool_size: 10