Re-Supervisordize everything.
This commit is contained in:
parent
dd18b1941d
commit
3b9b073f8d
|
@ -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
|
||||
|
|
|
@ -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)"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
name:
|
||||
- nginx
|
||||
- nginx-common
|
||||
- nginx-extras
|
||||
- libnginx-mod-nchan
|
||||
|
||||
- name: Create nginx ssl directory
|
||||
file:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue