Merge pull request 'Fix icon paths.' (#17) from fix-icons into main

Reviewed-on: #17
Reviewed-by: meaz <meaz@no-reply@disroot.org>

tasks/configure.yml

@@ -62,4 +62,4 @@
   with_items: "{{ pleroma_custom_emoji_list }}"
   when:  'pleroma_custom_emoji == true'
   tags:
-    - upgrade
+    - upgrade

tasks/frontends.yml

@@ -37,22 +37,10 @@
   become: yes
   become_user: '{{ pleroma_user }}'
   
-- name: '[Frontend] - Create extra static dir'
-  file:
-    path: '{{ pleroma_data_dir }}/static/static'
-    state: directory
-    owner: '{{ pleroma_user }}'
-    group: '{{ pleroma_group }}'
-    mode: 0775
-  tags:
-    - upgrade
-  become: yes
-  become_user: '{{ pleroma_user }}'
-
 - name: '[Frontend] - Add instance logo svg'
   copy:
     src: '{{ pleroma_extra_files_path }}/logo.svg'
-    dest: '{{ pleroma_data_dir }}/static/static/logo.svg'
+    dest: '{{ pleroma_data_dir }}/static/instance/logo.svg'
     owner: '{{ pleroma_user }}'
     group: '{{ pleroma_group }}'
     mode: 0775
@@ -64,7 +52,7 @@
 - name: '[Frontend] - Add instance logo png'
   copy:
     src: '{{ pleroma_extra_files_path }}/logo.png'
-    dest: '{{ pleroma_data_dir }}/static/static/logo.png'
+    dest: '{{ pleroma_data_dir }}/static/instance/logo.png'
     owner: '{{ pleroma_user }}'
     group: '{{ pleroma_group }}'
     mode: 0775
@@ -76,7 +64,7 @@
 - name: '[Frontend] - Add PWA logo'
   copy:
     src: '{{ pleroma_extra_files_path }}/logo-512.png'
-    dest: '{{ pleroma_data_dir }}/static/static/logo-512.png'
+    dest: '{{ pleroma_data_dir }}/static/logo-512.png'
     owner: '{{ pleroma_user }}'
     group: '{{ pleroma_group }}'
     mode: 0775
@@ -121,4 +109,4 @@
   tags:
     - upgrade
   become: 'yes'
-  become_user: "{{ pleroma_user }}"
+  become_user: "{{ pleroma_user }}"

templates/config.exs.j2

@@ -89,11 +89,11 @@ config :pleroma, :ldap,
   enabled: true,
   host: "{{ pleroma_ldap_host }}",
   port: {{ pleroma_ldap_port }},
-  ssl: "{{ pleroma_ldap_ssl }}",
+  ssl: {{ pleroma_ldap_ssl }},
 {% if pleroma_ldap_sslotps is defined %}
   sslopts: "{{ pleroma_ldap_sslopts }}",
 {% endif %}
-  tls: "{{ pleroma_ldap_tls }}",
+  tls: {{ pleroma_ldap_tls }},
 {% if pleroma_ldap_tlsotps is defined %}
   sslopts: "{{ pleroma_ldap_tlsopts }}",
 {% endif %}
@@ -180,16 +180,13 @@ config :pleroma, :frontend_configurations,
       "😮",
       "😢",
       "😩",
-      "👍",
-      "❤️",
-      "😆",
-      "😮",
-      "😢",
-      "😩"
+      "🤔",
+      "🎉",
+      "💩"
       ],
   accentColor: "{{ mangane_accentColor }}",
   colors: %{},
-  logo: "/static/logo.svg",
+  logo: "/instance/logo.svg",
 {% set current_year = now().year %} # Allows to set the current year in copyright!
   copyright: "🕶 {{ current_year|string }}. {{ mangane_copyright }}",  
   logoDarkMode: nil,
@@ -199,4 +196,4 @@ config :pleroma, :frontend_configurations,
   gdpr: false
   }
 {% endif %}
-{% endfor %}
+{% endfor %}