Added more config variables to pleroma.

5 files changed, 20 insertions, 5 deletions

diff --git a/roles/nginx/handlers/main.yaml b/roles/nginx/handlers/main.yaml
index ce43c17..1feca07 100644
--- a/roles/nginx/handlers/main.yaml
+++ b/roles/nginx/handlers/main.yaml
@@ -1,4 +1,5 @@
 ---
+
 - name: restart nginx
   become: yes
   systemd: name="nginx" state="restarted" daemon_reload="yes"
diff --git a/roles/pleroma/defaults/main.yaml b/roles/pleroma/defaults/main.yaml
index e39ba8a..8883855 100644
--- a/roles/pleroma/defaults/main.yaml
+++ b/roles/pleroma/defaults/main.yaml
@@ -2,4 +2,10 @@
 
 pleroma_user: "pleroma"
 pleroma_instance_name: "{{pleroma_host}}"
+pleroma_host: "localhost"
+pleroma_scheme: "https"
+pleroma_port: 443
 pleroma_admin_email: "admin@{{pleroma_host}}"
+pleroma_char_limit: 5000
+pleroma_signup_open: "true"
+pleroma_db_host: "localhost"
diff --git a/roles/pleroma/handlers/main.yaml b/roles/pleroma/handlers/main.yaml
new file mode 100644
index 0000000..452811a
--- /dev/null
+++ b/roles/pleroma/handlers/main.yaml
@@ -0,0 +1,5 @@
+---
+
+- name: restart pleroma
+  become: yes
+  systemd: name="pleroma" state="restarted" daemon_reload="yes"
diff --git a/roles/pleroma/tasks/main.yaml b/roles/pleroma/tasks/main.yaml
index 9266e6d..fa02320 100644
--- a/roles/pleroma/tasks/main.yaml
+++ b/roles/pleroma/tasks/main.yaml
@@ -54,11 +54,13 @@
   with_items:
     - "setup_db.psql"
     - "dev.secret.exs"
+  notify: restart pleroma
 
 - name: install pleroma psql
   become: yes
   become_user: "postgres"
   command: "psql -f ~{{pleroma_user}}/pleroma/config/setup_db.psql"
+  notify: restart pleroma
 
 - name: migrate db
   become: yes
@@ -71,6 +73,7 @@
     - "mix local.rebar --force"
     - "mix deps.get"
     - "mix ecto.migrate"
+  notify: restart pleroma
 
 - name: install pleroma systemd service
   template:
diff --git a/roles/pleroma/templates/dev.secret.exs.j2 b/roles/pleroma/templates/dev.secret.exs.j2
index fee7ac8..3cf913f 100644
--- a/roles/pleroma/templates/dev.secret.exs.j2
+++ b/roles/pleroma/templates/dev.secret.exs.j2
@@ -1,15 +1,15 @@
 use Mix.Config
 
 config :pleroma, Pleroma.Web.Endpoint,
-   url: [host: "{{pleroma_host}}", scheme: "https", port: 443],
+   url: [host: "{{pleroma_host}}", scheme: "{{pleroma_scheme}}", port: {{pleroma_port}}],
    secret_key_base: "{{pleroma_secret_key}}"
 
 config :pleroma, :instance,
   name: "{{pleroma_instance_name}}",
   email: "{{pleroma_admin_email}}",
-  limit: 5000,
-  registrations_open: true,
-  dedupe_media: false
+  limit: {{pleroma_char_limit}},
+  registrations_open: {{pleroma_signup_open}},
+  dedupe_media: true
 
 config :pleroma, :media_proxy,
   enabled: false,
@@ -22,5 +22,5 @@ config :pleroma, Pleroma.Repo,
   username: "{{pleroma_user}}",
   password: "{{pleroma_db_passwd}}",
   database: "{{pleroma_user}}",
-  hostname: "localhost",
+  hostname: "{{pleroma_db_host}}",
   pool_size: 10