diff --git a/README.md b/README.md index 18cc417..ae8b815 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,6 @@ You can deploy test instance using `Vagrantfile` attached to the role. Then you can then access gitea from your computer on `http://192.168.33.15` To update pleroma include `upgrade` **tag**. + +## Customization +In the `files` folder, `avi.png` is the default user avatar. \ No newline at end of file diff --git a/defaults/main.yml b/defaults/main.yml index e1dd6d9..991e97e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -63,6 +63,7 @@ pleroma_nofile: '500000' pleroma_instance_favicons: 'true' pleroma_remoteip: 'true' pleroma_proxies: '["192.168.33.15"]' +pleroma_captcha: 'false' pleroma_custom_emoji: 'true' pleroma_custom_emoji_list: - name: 'blobbear' @@ -73,7 +74,7 @@ pleroma_frontends: - name: 'mangane' conf: 'primary' ref: 'dist' - url: 'https://github.com/Cl0v1s/mangane-ui/releases/latest/download/static.zip' + url: 'https://github.com/BDX-town/Mangane/releases/latest/download/static.zip' - name: 'admin-fe' conf: 'admin' ref: 'develop' diff --git a/files/avi.png b/files/avi.png new file mode 100644 index 0000000..bb1134b Binary files /dev/null and b/files/avi.png differ diff --git a/tasks/frontends.yml b/tasks/frontends.yml index 6ef6f25..0049ee0 100644 --- a/tasks/frontends.yml +++ b/tasks/frontends.yml @@ -4,26 +4,34 @@ systemd: name: 'pleroma.service' state: 'started' - + tags: + - upgrade + - name: '[Frontend] - Install/update known frontends' command: '{{ pleroma_app_dir }}/release/bin/pleroma_ctl frontend install {{ item.name }} --ref {{ item.ref }}' become: yes become_user: '{{ pleroma_user }}' with_items: '{{ pleroma_frontends }}' when: 'item.url is not defined' - + tags: + - upgrade + - name: '[Frontend] - Install/update custom frontends' command: '{{ pleroma_app_dir }}/release/bin/pleroma_ctl frontend install {{ item.name }} --ref {{ item.ref }} --build-url {{ item.url }}' become: yes become_user: '{{ pleroma_user }}' with_items: '{{ pleroma_frontends }}' when: 'item.url is defined' - + tags: + - upgrade + - name: '[Frontend] - Create images dir' file: path: '{{ pleroma_data_dir }}/static/images' state: directory - + tags: + - upgrade + - name: '[Frontend] - Add instance logo' copy: src: '{{ pleroma_extra_files_path }}/logo.svg' @@ -31,7 +39,9 @@ owner: '{{ pleroma_user }}' group: '{{ pleroma_group }}' mode: 0775 - + tags: + - upgrade + - name: '[Frontend] - Add instance favicon' copy: src: '{{ pleroma_extra_files_path }}/logo.png' @@ -39,7 +49,19 @@ owner: '{{ pleroma_user }}' group: '{{ pleroma_group }}' mode: 0775 - + tags: + - upgrade + +- name: '[Frontend] - Add default user avatar' + copy: + src: '{{ pleroma_extra_files_path }}/avi.png' + dest: '{{ pleroma_data_dir }}/static/images/avi.png' + owner: '{{ pleroma_user }}' + group: '{{ pleroma_group }}' + mode: 0775 + tags: + - upgrade + - name: '[Frontend] - Add custom configs' copy: src: '{{pleroma_extra_files_path }}/{{ item.name }}/{{ item.filename }}' @@ -49,3 +71,6 @@ mode: 0775 loop: '{{ pleroma_frontend_custom_configs }}' when: 'pleroma_frontend_custom_configs is defined' + tags: + - upgrade + \ No newline at end of file diff --git a/tasks/install.yml b/tasks/install.yml index d1db418..f722418 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -7,7 +7,7 @@ owner: '{{ pleroma_user }}' group: '{{ pleroma_group }}' -- name: '[Install] - Donwload and unarchive release' +- name: '[Install] - Download and unarchive release' unarchive: src: '{{ pleroma_download_url }}' dest: '{{ pleroma_tmp_dir }}' diff --git a/tasks/upgrade.yml b/tasks/upgrade.yml index f1a8891..ab27db3 100644 --- a/tasks/upgrade.yml +++ b/tasks/upgrade.yml @@ -4,20 +4,32 @@ command: '{{ pleroma_app_dir }}/release/bin/pleroma_ctl update' become: yes become_user: '{{ pleroma_user }}' + tags: + - upgrade + - never - name: '[Upgrade] - Stop backend' systemd: name: pleroma state: 'stopped' daemon_reload: 'yes' + tags: + - upgrade + - never - name: '[Upgrade] - Run migrations' command: '{{ pleroma_app_dir }}/release/bin/pleroma_ctl migrate' become: yes become_user: '{{ pleroma_user }}' + tags: + - upgrade + - never - name: '[Upgrade] - Start backend' systemd: name: pleroma state: 'started' daemon_reload: 'yes' + tags: + - upgrade + - never \ No newline at end of file diff --git a/templates/config.exs.j2 b/templates/config.exs.j2 index 0203442..445fafc 100644 --- a/templates/config.exs.j2 +++ b/templates/config.exs.j2 @@ -44,6 +44,11 @@ config :pleroma, Pleroma.Repo, pool_size: 10, timeout: 60000 +config :pleroma, Pleroma.Captcha, + enabled: {{ pleroma_captcha }, + seconds_valid: 300, + method: Pleroma.Captcha.Native + config :logger, backends: [{ExSyslogger, :ex_syslogger}]