Skip to content

Commit 6ae7e52

Browse files
committed
override the whole dang config file
1 parent 84de110 commit 6ae7e52

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

after-install.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@
55
set -e
66

77
if [ -d ~abc/.ssh ]; then
8-
chown -R abc: ~abc/.ssh
9-
fi
10-
11-
if [ -d "/var/log/workers" ]; then
12-
chown -R abc: /var/log/workers
13-
fi
14-
15-
if [ -d "/etc/supervisor/conf.d" ]; then
16-
rm -rf /etc/supervisor/conf.d
8+
chown -R abc: ~abc
179
fi
1810

1911
if [ -x "/bin/systemctl" ]; then

before-remove.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ if [ -L /config/server.json ]; then
1010
rm -f /config/server.json
1111
fi
1212

13-
# Put this back.
14-
if [ -d /etc/supervisor ]; then
15-
rm -f /etc/supervisor/conf.d
16-
mkdir /etc/supervisor/conf.d
13+
if [ -L /config/log ]; then
14+
rm -f /config/log
1715
fi
1816

1917
if [ -x "/bin/systemctl" ]; then

build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ read -r -d '' PACKAGE_ARGS <<- PACKAGE_ARGS
5252
--vendor='${VENDOR}'
5353
PACKAGE_ARGS
5454

55-
mkdir -p root/var/log/workers
56-
5755
rm -f ${PACKAGE_NAME}_${VERSION}-${ITERATION}_amd64.deb
5856
echo fpm -s dir -t deb ${PACKAGE_ARGS} ${DEPENDS} -a amd64 -v ${VERSION} -C root/
5957
eval fpm -s dir -t deb ${PACKAGE_ARGS} ${DEPENDS} -a amd64 -v ${VERSION} -C root/

root/etc/systemd/system/supervisor.service.d/notifiarr.conf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,11 @@
22
# Those files live in a folder with this server's name, so create a dynamic symlink to reach them at a known path.
33
[Service]
44
ExecStartPre=/bin/bash -c 'ln -sf "/share/websites/confs/server.$(hostname -s)" "/config/server.json"'
5-
ExecStartPre=/bin/bash -c 'ln -Tsf "/share/workers/$(hostname -s)/supervisor/" "/etc/supervisor/conf.d"'
65
ExecStartPre=/bin/bash -c 'ln -Tsf "/share/logs/notifiarr/supervisor/$(hostname -s)" "/config/log"'
6+
ExecStartPre=/usr/bin/php /share/websites/www/notifiarr.com/supervisor/confBuilder.php
7+
ExecStartPre=/bin/bash -c 'chown -R abc: "/share/workers/$(hostname -s)/supervisor"'
8+
ExecStart=
9+
ExecStart=/usr/bin/supervisord -n -c /config/supervisor/supervisord.conf
10+
ExecReload=/
11+
ExecReload=/usr/bin/supervisorctl -c /config/supervisor/supervisord.conf $OPTIONS reload
12+

0 commit comments

Comments
 (0)