Reorganize configs, add more comments

tasks/main.yml

@@ -10,7 +10,7 @@
     - name: assure operational directory
       file: path={{ pleroma_home }} state=directory owner=pleroma group=pleroma mode="3775"
     - name: assure systemd unit
-      template: src=pleroma.service dest=/etc/systemd/system/pleroma@.service
+      template: src=pleroma.service dest=/etc/systemd/system/pleroma.service
       notify: restart pleroma
 - name: set up pleroma
   block:
@@ -20,7 +20,7 @@
         name: "{{ item }}"
         login_host: "{{ pleroma_db_host }}"
         login_user: "{{ pleroma_db_user }}"
-        login_pass: "{{ pleroma_db_pass }}"
+        login_password: "{{ pleroma_db_pass }}"
       loop:
         - citext
         - pg_trgm
@@ -32,7 +32,7 @@
     - name: install pleroma
       block:
         - name: stop pleroma
-          systemd: name=pleroma@{{ pleroma_name }} state=stopped
+          systemd: name=pleroma state=stopped
         - name: unzip release
           unarchive: src={{ pleroma_home }}/release.zip dest={{ pleroma_home }} remote_src=yes
         - name: remove old release
@@ -61,7 +61,7 @@
       template: src=config.exs dest=/etc/pleroma/config.exs owner=pleroma group=pleroma mode="0640"
       notify: restart pleroma
     - name: migrate db
-      command: {{ pleroma_home }}/bin/pleroma_ctl migrate
+      command: "{{ pleroma_home }}/bin/pleroma_ctl migrate"
       args:
         chdir: "{{ pleroma_home }}"
       become: yes

templates/config.exs

@@ -1,12 +1,35 @@
+#
+# This file managed via Ansible; changes will be overwritten
 # WARNING: THIS FILE CONTAINS SENSITIVE INFORMATION
+# DO NOT ALLOW WORLD READ ACCESS TO THIS FILE
+#
 import Config
 
-# Basic configuration
+# Endpoint configuration
 config :pleroma, Pleroma.Web.Endpoint,
 	url: [host: "{{ pleroma_hostname }}", scheme: "https", port: 443],
 	http: [ip: {127, 0, 0, 1}, port: 4000],
 	secret_key_base: "{{ pleroma_secret_key_base }}",
 	signing_salt: "{{ pleroma_secret_signing_salt }}"
+# DB configuration
+config :pleroma, Pleroma.Repo,
+	adapter: Ecto.Adapters.Postgres,
+	database: "{{ pleroma_db_name }}",
+	hostname: "{{ pleroma_db_host }}",
+	username: "{{ pleroma_db_user }}",
+	password: "{{ pleroma_db_pass }}",
+	pool_size: {{ pleroma_db_pool_size }}
+config :pleroma, :database, rum_enabled: false
+# Use in-DB configs
+config :pleroma, configurable_from_database: true
+
+#
+# NOTE: Everything below this line is only used before the initial DB migration
+# If you would like to change these settings, use the admin FE
+#
+# https://docs.pleroma.social/backend/configuration/howto_database_config/
+# 
+
 config :pleroma, :instance,
 	name: "{{ pleroma_instance_name }}",
 	desc: "{{ pleroma_instance_desc }}",
@@ -22,22 +45,9 @@ config :pleroma, :media_proxy,
 	enabled: false,
 	redirect_on_failure: true
 
-# Use in-db configs where possible
-config :pleroma, configurable_from_database: true
-
-# DB configuration
-config :pleroma, Pleroma.Repo,
-	adapter: Ecto.Adapters.Postgres,
-	database: "{{ pleroma_db_name }}",
-	hostname: "{{ pleroma_db_host }}",
-	username: "{{ pleroma_db_user }}",
-	password: "{{ pleroma_db_pass }}",
-	pool_size: {{ pleroma_db_pool_size }}
-config :pleroma, :database, rum_enabled: false
-
 # Mail
 config :pleroma, Pleroma.Emails.Mailer,
-	enabled: false,
+	enabled: false
 
 # Theming
 config :pleroma, :frontend_configurations,

templates/pleroma.service

@@ -5,14 +5,14 @@ After=network.target
 
 [Service]
 User=pleroma
-Environment="HOME={{ pleroma_home }}/%i}"
-WorkingDirectory={{ pleroma_home }}/%i
+Environment="HOME={{ pleroma_home }}"
+WorkingDirectory={{ pleroma_home }}
 
 KillMode=process
 Restart=on-failure
 
-ExecStart={{ pleroma_home }}/%i/bin/pleroma start
-ExecStop={{ pleroma_home }}/%i/bin/pleroma stop
+ExecStart={{ pleroma_home }}/bin/pleroma start
+ExecStop={{ pleroma_home }}/bin/pleroma stop
 
 PrivateTmp=true
 ProtectHome=true