From 309a569c00ad00a5146a73412a2c2b5b0c2c9760 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Sat, 7 Mar 2020 12:21:57 +0000 Subject: [PATCH] feat: allow admins to disable the chat window The commit adds the option to allow instance admins to enable or disbale the chat window at the bottom right of the page. By default the chat window is enabled. This resolves dananglin/pleroma-ansible-playbook#10 --- roles/init/defaults/main.yml | 1 + roles/pleroma-main/handlers/main.yml | 4 ++++ roles/pleroma-main/tasks/main.yml | 7 +++++-- roles/pleroma-main/templates/etc_pleroma_config.exs.j2 | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 roles/pleroma-main/handlers/main.yml diff --git a/roles/init/defaults/main.yml b/roles/init/defaults/main.yml index ec17194..677d5cd 100644 --- a/roles/init/defaults/main.yml +++ b/roles/init/defaults/main.yml @@ -14,6 +14,7 @@ pleroma_defaults: remotePostRetentionDays: 90 logLevel: info federating: "true" + chatEnabled: "true" mrf: simplePolicy: reject: [] diff --git a/roles/pleroma-main/handlers/main.yml b/roles/pleroma-main/handlers/main.yml new file mode 100644 index 0000000..5744a0e --- /dev/null +++ b/roles/pleroma-main/handlers/main.yml @@ -0,0 +1,4 @@ +- name: restart pleroma + service: + name: pleroma + state: restarted diff --git a/roles/pleroma-main/tasks/main.yml b/roles/pleroma-main/tasks/main.yml index ce27373..84ec917 100644 --- a/roles/pleroma-main/tasks/main.yml +++ b/roles/pleroma-main/tasks/main.yml @@ -140,6 +140,7 @@ find /tmp/release/ -mindepth 1 -maxdepth 1 | xargs -I dir mv dir {{ pleroma_user.home }} args: creates: "{{ pleroma_user.home }}/bin/pleroma" + notify: "restart pleroma" when: enable_pleroma_installation is defined - name: Ensuring the configuration file is set. @@ -149,6 +150,7 @@ owner: "{{ pleroma_user.name }}" group: "{{ pleroma_user.group }}" mode: '0400' + notify: "restart pleroma" - name: Running database migrations. command: @@ -171,6 +173,7 @@ owner: "{{ pleroma_user.name }}" group: "{{ pleroma_user.group }}" mode: '0400' + notify: "restart pleroma" when: pleroma.config.frontend.background|length - name: Ensuring that the custom themes are uploaded. @@ -198,12 +201,12 @@ owner: root group: root mode: '0700' + notify: "restart pleroma" -- name: Ensuring that the Pleroma service is enabled and started. +- name: Ensuring that the Pleroma service is enabled. service: name: pleroma enabled: yes - state: started - name: Cleaning up file: diff --git a/roles/pleroma-main/templates/etc_pleroma_config.exs.j2 b/roles/pleroma-main/templates/etc_pleroma_config.exs.j2 index a701c91..5137302 100644 --- a/roles/pleroma-main/templates/etc_pleroma_config.exs.j2 +++ b/roles/pleroma-main/templates/etc_pleroma_config.exs.j2 @@ -110,3 +110,5 @@ config :pleroma, :mrf_simple, "{{ item }}"{{ "," if not loop.last else "" }} {% endfor %} ] + +config :pleroma, :chat, enabled: {{ pleroma.config.chatEnabled }}