6 files changed, 36 insertions, 60 deletions
diff --git a/pleroma/otp/defaults/main.yaml b/pleroma/otp/defaults/main.yaml
index 86dac13..827661e 100644
--- a/pleroma/otp/defaults/main.yaml
+++ b/pleroma/otp/defaults/main.yaml
@@ -23,9 +23,6 @@ pleroma_db: "pleroma_{{pleroma_instance}}"
 pleroma_db_user: "pleroma_{{pleroma_instance}}"
 pleroma_data_dir: "/var/lib/pleroma/instance_data"
 
-pleroma_download_url: "https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/stable/download?job={{pleroma_arch}}"
+pleroma_version: "2.10.0"
+pleroma_download_url: "http://{{build_server_host}}:{{build_server_port}}/pleroma-{{pleroma_version}}.tar.gz"
 
-pleroma_soapbox: false
-# https://gitlab.com/soapbox-pub/soapbox/-/releases
-pleroma_soapbox_version: "v3.2.0"
-pleroma_soapbox_download_url: "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/{{pleroma_soapbox_version}}/download?job=build-production"
diff --git a/pleroma/otp/tasks/install.yaml b/pleroma/otp/tasks/install.yaml
index 2759729..65ab2c1 100644
--- a/pleroma/otp/tasks/install.yaml
+++ b/pleroma/otp/tasks/install.yaml
@@ -1,25 +1,24 @@
 ---
 
+- name: check if pleroma version already installed
+  stat:
+    path: "/opt/pleroma/releases/{{pleroma_version}}"
+  register: installed_version
+
 - name: download and unarchive pleroma release
   become: yes
   unarchive:
     src: "{{pleroma_download_url}}"
     dest: "/tmp/"
     remote_src: yes
-  register: pleroma_download
-  ignore_errors: true
-
-- name: warn if pleroma download failed
-  debug:
-    msg: "WARNING: Could not download Pleroma release from {{pleroma_download_url}} — skipping install, existing binary unchanged."
-  when: pleroma_download is failed
+  when: not installed_version.stat.exists
 
 - name: delete old pleroma release
   become: yes
   file:
     path: "/opt/pleroma/"
     state: "absent"
-  when: pleroma_download is succeeded
+  when: not installed_version.stat.exists
 
 - name: install pleroma release
   become: yes
@@ -27,7 +26,5 @@
     remote_src: true
     src: "/tmp/release/"
     dest: "/opt/pleroma/"
-    owner: "pleroma"
-    group: "pleroma"
-  when: pleroma_download is succeeded
+  when: not installed_version.stat.exists
   notify: restart all pleroma instances
diff --git a/pleroma/otp/tasks/instance.yaml b/pleroma/otp/tasks/instance.yaml
index d8983e4..3a48991 100644
--- a/pleroma/otp/tasks/instance.yaml
+++ b/pleroma/otp/tasks/instance.yaml
@@ -22,6 +22,8 @@
     - "{{pleroma_data_dir}}/{{pleroma_instance}}"
     - "{{pleroma_data_dir}}/{{pleroma_instance}}/uploads"
     - "{{pleroma_data_dir}}/{{pleroma_instance}}/static"
+    - "{{pleroma_data_dir}}/{{pleroma_instance}}/static/static"
+    - "{{pleroma_data_dir}}/{{pleroma_instance}}/static/static/themes"
 
 - name: install pleroma db schema file
   become: yes
@@ -40,8 +42,25 @@
   changed_when: false
   no_log: true
 
-- include_tasks: soapbox.yaml
-  when: pleroma_soapbox
+- name: install pleroma fe theme
+  become: yes
+  copy:
+    src: "files/{{pleroma_link_host}}/{{pleroma_fe_theme}}.json"
+    dest: "{{pleroma_data_dir}}/{{pleroma_instance}}/static/static/themes/{{pleroma_fe_theme}}.json"
+    owner: "pleroma"
+    group: "pleroma"
+    mode: "0644"
+  when: pleroma_fe_theme is defined
+
+- name: install pleroma styles index
+  become: yes
+  copy:
+    src: "files/{{pleroma_link_host}}/styles.json"
+    dest: "{{pleroma_data_dir}}/{{pleroma_instance}}/static/styles.json"
+    owner: "pleroma"
+    group: "pleroma"
+    mode: "0644"
+  when: pleroma_fe_theme is defined
 
 - name: ensure pleroma instance is enabled and started
   become: yes
@@ -49,7 +68,6 @@
 
 - name: migrate db
   become: yes
-  become_user: "pleroma"
   command: "/opt/pleroma/bin/pleroma_ctl migrate"
   args:
     chdir: "/opt/pleroma/"
diff --git a/pleroma/otp/tasks/main.yaml b/pleroma/otp/tasks/main.yaml
index 1052644..6f8427e 100644
--- a/pleroma/otp/tasks/main.yaml
+++ b/pleroma/otp/tasks/main.yaml
@@ -30,11 +30,6 @@
     dest: "/lib/systemd/system/[email protected]"
   notify: restart pleroma instance
 
-- name: check if pleroma release exists
-  stat: path="/tmp/release/"
-  register: release
-
 - include_tasks: install.yaml
-  when: not release.stat.exists
 
 - include_tasks: instance.yaml
diff --git a/pleroma/otp/tasks/soapbox.yaml b/pleroma/otp/tasks/soapbox.yaml
deleted file mode 100644
index d004aec..0000000
--- a/pleroma/otp/tasks/soapbox.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-
-- name: download and unarchive soapbox frontend
-  unarchive:
-    src: "{{pleroma_soapbox_download_url}}"
-    dest: "/tmp/"
-    creates: "/tmp/static"
-    remote_src: yes
-
-- name: delete old soapbox frontend
-  become: yes
-  file:
-    path: "{{pleroma_data_dir}}/{{pleroma_instance}}/static/"
-    state: "absent"
-  changed_when: false
-
-- name: install soapbox frontend
-  become: yes
-  copy:
-    remote_src: true
-    src: "/tmp/static/"
-    dest: "{{pleroma_data_dir}}/{{pleroma_instance}}/static/"
-    owner: "pleroma"
-    group: "pleroma"
-    mode: "0755"
-  changed_when: false
-
-- name: install soapbox config
-  become: yes
-  copy:
-    src: "files/{{pleroma_link_host}}/soapbox.json"
-    dest: "{{pleroma_data_dir}}/{{pleroma_instance}}/static/instance/soapbox.json"
-    owner: "pleroma"
-    group: "pleroma"
-    mode: "0755"
-  changed_when: false
diff --git a/pleroma/otp/templates/config.exs.j2 b/pleroma/otp/templates/config.exs.j2
index 0db1828..eb1be5b 100644
--- a/pleroma/otp/templates/config.exs.j2
+++ b/pleroma/otp/templates/config.exs.j2
@@ -55,6 +55,11 @@ config :pleroma, Pleroma.PromEx,
   ],
   datasource: "Prometheus"
 
+{% if pleroma_fe_theme is defined %}
+config :pleroma, :frontend_configurations,
+  pleroma_fe: %{theme: "{{pleroma_fe_theme}}"}
+{% endif %}
+
 config :logger,
   backends: [{ExSyslogger, :ex_syslogger}]