From 3b9b073f8d2a702a563099fea3e812203a1d2f07 Mon Sep 17 00:00:00 2001
From: "Buster \"Silver Eagle\" Neece" <buster@busterneece.com>
Date: Sat, 28 May 2022 20:30:39 -0500
Subject: [PATCH] Re-Supervisordize everything.

---
 src/Nginx/ConfigWriter.php                        |  3 +--
 update.sh                                         |  2 +-
 util/ansible/roles/azuracast-cron/tasks/main.yml  | 14 ++++++++++++++
 util/ansible/roles/nginx/tasks/main.yml           |  2 +-
 util/ansible/roles/sftpgo/tasks/main.yml          | 14 ++++++++++++++
 .../roles/sftpgo/templates/supervisor.conf.j2     | 10 ++++++++++
 util/ansible/roles/supervisord/tasks/main.yml     | 11 +++++------
 util/ansible/update.yml                           | 15 +++++++--------
 util/docker/web/setup/nginx.sh                    |  2 +-
 9 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 util/ansible/roles/sftpgo/templates/supervisor.conf.j2

diff --git a/src/Nginx/ConfigWriter.php b/src/Nginx/ConfigWriter.php
index 6b696a932..06d2761ff 100644
--- a/src/Nginx/ConfigWriter.php
+++ b/src/Nginx/ConfigWriter.php
@@ -33,8 +33,7 @@ final class ConfigWriter implements EventSubscriberInterface
 
         $shortCode = $station->getShortName();
 
-        $frontendConfig = $station->getFrontendConfig();
-        $port = $frontendConfig->getPort();
+        $port = $station->getFrontendConfig()->getPort();
 
         $event->appendBlock(
             <<<NGINX
diff --git a/update.sh b/update.sh
index b8f4bae83..2737af5b0 100755
--- a/update.sh
+++ b/update.sh
@@ -34,7 +34,7 @@ else
 fi
 
 APP_ENV="${APP_ENV:-production}"
-UPDATE_REVISION="${UPDATE_REVISION:-86}"
+UPDATE_REVISION="${UPDATE_REVISION:-87}"
 
 echo "Updating AzuraCast (Environment: $APP_ENV, Update revision: $UPDATE_REVISION)"
 
diff --git a/util/ansible/roles/azuracast-cron/tasks/main.yml b/util/ansible/roles/azuracast-cron/tasks/main.yml
index 856aebed7..a116e329d 100644
--- a/util/ansible/roles/azuracast-cron/tasks/main.yml
+++ b/util/ansible/roles/azuracast-cron/tasks/main.yml
@@ -20,3 +20,17 @@
   file:
     path: "{{ tmp_base }}/azuracast_cron"
     state: absent
+
+- name: Install Cron Supervisord conf
+  template:
+    src: supervisor.conf.j2
+    dest: /etc/supervisor/conf.d/cron.conf
+    force: true
+    mode: 0644
+
+- name: Disable Cron service
+  service:
+    name: "cron"
+    enabled: false
+    state: stopped
+  ignore_errors: true
diff --git a/util/ansible/roles/nginx/tasks/main.yml b/util/ansible/roles/nginx/tasks/main.yml
index 94af2c5f1..8247e85a9 100644
--- a/util/ansible/roles/nginx/tasks/main.yml
+++ b/util/ansible/roles/nginx/tasks/main.yml
@@ -31,7 +31,7 @@
     name:
       - nginx
       - nginx-common
-      - nginx-extras
+      - libnginx-mod-nchan
 
 - name: Create nginx ssl directory
   file:
diff --git a/util/ansible/roles/sftpgo/tasks/main.yml b/util/ansible/roles/sftpgo/tasks/main.yml
index 0b733c8f7..bffeaad37 100644
--- a/util/ansible/roles/sftpgo/tasks/main.yml
+++ b/util/ansible/roles/sftpgo/tasks/main.yml
@@ -15,3 +15,17 @@
     dest: "/etc/sftpgo/sftpgo.json"
     force: true
     mode: 0644
+
+- name: Install SFTPGo Supervisord conf
+  template:
+    src: supervisor.conf.j2
+    dest: /etc/supervisor/conf.d/sftpgo.conf
+    force: true
+    mode: 0644
+
+- name: Disable SFTPGo service
+  service:
+    name: "sftpgo"
+    enabled: false
+    state: stopped
+  ignore_errors: true
diff --git a/util/ansible/roles/sftpgo/templates/supervisor.conf.j2 b/util/ansible/roles/sftpgo/templates/supervisor.conf.j2
new file mode 100644
index 000000000..b6cc32ee9
--- /dev/null
+++ b/util/ansible/roles/sftpgo/templates/supervisor.conf.j2
@@ -0,0 +1,10 @@
+[program:sftpgo]
+command=sftpgo --config-dir=/var/azuracast/sftpgo serve -l ""
+dir=/var/azuracast/sftpgo
+user=azuracast
+priority=700
+numprocs=1
+autostart=true
+autorestart=true
+stopasgroup=true
+killasgroup=true
diff --git a/util/ansible/roles/supervisord/tasks/main.yml b/util/ansible/roles/supervisord/tasks/main.yml
index 07724c48c..7fef27df4 100644
--- a/util/ansible/roles/supervisord/tasks/main.yml
+++ b/util/ansible/roles/supervisord/tasks/main.yml
@@ -10,10 +10,9 @@
     force: true
     mode: 0644
 
-- name: Remove old core supervisord configurations
-  file:
-    path: "{{ item }}"
-    state: absent
-  with_fileglob:
-    - "/etc/supervisor/conf.d/*.conf"
+- name: Temporarily turn off supervisord
+  service:
+    name: "supervisor"
+    enabled: true
+    state: stopped
   ignore_errors: true
diff --git a/util/ansible/update.yml b/util/ansible/update.yml
index a69f728d8..02b48f75e 100644
--- a/util/ansible/update.yml
+++ b/util/ansible/update.yml
@@ -23,25 +23,24 @@
       when: update_revision|int < 82
 
     - role: "supervisord"
-      when: update_revision|int < 83
 
     - role: "mariadb"
-      when: update_revision|int < 83
+      when: update_revision|int < 87
 
     - role: "nginx"
-      when: update_revision|int < 85
+      when: update_revision|int < 87
 
     - role: "redis"
-      when: update_revision|int < 84
+      when: update_revision|int < 87
 
     - role: "beanstalkd"
-      when: update_revision|int < 83
+      when: update_revision|int < 87
 
     - role: "sftpgo"
-      when: update_revision|int < 86
+      when: update_revision|int < 87
 
     - role: "php"
-      when: update_revision|int < 83
+      when: update_revision|int < 87
 
     - role: "composer"
 
@@ -55,7 +54,7 @@
       when: update_revision|int < 51
 
     - role: "azuracast-cron"
-      when: update_revision|int < 83
+      when: update_revision|int < 87
 
     - role: "services"
 
diff --git a/util/docker/web/setup/nginx.sh b/util/docker/web/setup/nginx.sh
index 71530b63b..dfa745e64 100644
--- a/util/docker/web/setup/nginx.sh
+++ b/util/docker/web/setup/nginx.sh
@@ -2,7 +2,7 @@
 set -e
 set -x
 
-apt-get install -y --no-install-recommends nginx nginx-common nginx-extras openssl
+apt-get install -y --no-install-recommends nginx nginx-common openssl libnginx-mod-nchan
 
 # Install nginx and configuration
 cp /bd_build/web/nginx/proxy_params.conf /etc/nginx/proxy_params