diff options
Diffstat (limited to 'roles/pleroma')
| -rw-r--r-- | roles/pleroma/defaults/main.yaml | 5 | ||||
| -rw-r--r-- | roles/pleroma/handlers/main.yaml | 2 | ||||
| -rw-r--r-- | roles/pleroma/meta/main.yaml | 4 | ||||
| -rw-r--r-- | roles/pleroma/tasks/main.yaml | 4 | ||||
| -rw-r--r-- | roles/pleroma/templates/pleroma.nginx.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/pleroma/templates/pleroma.service.j2 | 2 |
6 files changed, 14 insertions, 7 deletions
diff --git a/roles/pleroma/defaults/main.yaml b/roles/pleroma/defaults/main.yaml index 94c39a1..c9cbf1d 100644 --- a/roles/pleroma/defaults/main.yaml +++ b/roles/pleroma/defaults/main.yaml @@ -4,8 +4,9 @@ pleroma_user: "pleroma" pleroma_instance_name: "{{pleroma_host}}" pleroma_desc: "A Pleroma fediverse instance." pleroma_host: "localhost" -pleroma_scheme: "https" -pleroma_port: 443 +pleroma_scheme: "http" +pleroma_port: 4000 +pleroma_url: "{{pleroma_scheme}}://{{pleroma_host}}:{{pleroma_port}}" pleroma_admin_email: "admin@{{pleroma_host}}" pleroma_char_limit: 5000 pleroma_signup_open: "true" diff --git a/roles/pleroma/handlers/main.yaml b/roles/pleroma/handlers/main.yaml index 452811a..b935f8d 100644 --- a/roles/pleroma/handlers/main.yaml +++ b/roles/pleroma/handlers/main.yaml @@ -2,4 +2,4 @@ - name: restart pleroma become: yes - systemd: name="pleroma" state="restarted" daemon_reload="yes" + systemd: name="{{pleroma_user}}" state="restarted" daemon_reload="yes" diff --git a/roles/pleroma/meta/main.yaml b/roles/pleroma/meta/main.yaml new file mode 100644 index 0000000..efae8cd --- /dev/null +++ b/roles/pleroma/meta/main.yaml @@ -0,0 +1,4 @@ +--- + +dependencies: + - nginx/site diff --git a/roles/pleroma/tasks/main.yaml b/roles/pleroma/tasks/main.yaml index 9d1a746..0d4ed29 100644 --- a/roles/pleroma/tasks/main.yaml +++ b/roles/pleroma/tasks/main.yaml @@ -75,12 +75,12 @@ - name: install pleroma systemd service template: src: "pleroma.service.j2" - dest: "/lib/systemd/system/pleroma.service" + dest: "/lib/systemd/system/{{pleroma_user}}.service" owner: "{{pleroma_user}}" group: "{{pleroma_user}}" mode: "0770" become: yes - name: enable pleroma systemd service - systemd: name="pleroma" enabled="yes" state="started" + systemd: name="{{pleroma_user}}" enabled="yes" state="started" become: yes diff --git a/roles/pleroma/templates/pleroma.nginx.conf.j2 b/roles/pleroma/templates/pleroma.nginx.conf.j2 index df35be6..34cec8a 100644 --- a/roles/pleroma/templates/pleroma.nginx.conf.j2 +++ b/roles/pleroma/templates/pleroma.nginx.conf.j2 @@ -81,7 +81,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - proxy_pass {{nginx_proxy}}; + proxy_pass {{pleroma_url}}; client_max_body_size 16m; } @@ -90,6 +90,6 @@ server { proxy_cache pleroma_media_cache; proxy_cache_lock on; proxy_ignore_client_abort on; - proxy_pass {{nginx_proxy}}; + proxy_pass {{pleroma_url}}; } } diff --git a/roles/pleroma/templates/pleroma.service.j2 b/roles/pleroma/templates/pleroma.service.j2 index e1cfd57..15a0879 100644 --- a/roles/pleroma/templates/pleroma.service.j2 +++ b/roles/pleroma/templates/pleroma.service.j2 @@ -1,3 +1,5 @@ +# {{ansible_managed}} + [Unit] Description=Pleroma social network After=network.target postgresql.service |