Skip to content

Commit 1dc8159

Browse files
committed
revert ccu3 patches on uninstall
1 parent f6d58c9 commit 1dc8159

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

addon_files/redmatic/bin/redmatic

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ SETTINGS=$ADDON_DIR/lib/settings.js
1010
RED_DIR=$ADDON_DIR/lib/node_modules/node-red
1111
RED=$RED_DIR/red.js
1212

13+
LIGHTTPD_CONF=/etc/lighttpd/lighttpd.conf
14+
LIGHTTPD_SSL_CONF=/etc/lighttpd/lighttpd_ssl.conf
15+
BACKUP_CGI=/www/config/cp_security.cgi
16+
1317
export PATH=$ADDON_DIR/bin:$PATH
1418
export LD_LIBRARY_PATH=$ADDON_DIR/lib:$LD_LIBRARY_PATH
1519
export GIT_EXEC_PATH=/usr/local/addons/redmatic/libexec/git-core
@@ -37,7 +41,6 @@ Stop () {
3741
}
3842

3943
Start () {
40-
LIGHTTPD_CONF=/etc/lighttpd/lighttpd.conf
4144
if ! grep -Fq "/etc/config/lighttpd/" $LIGHTTPD_CONF
4245
then
4346
echo "patching $LIGHTTPD_CONF"
@@ -48,7 +51,6 @@ Start () {
4851
/etc/init.d/S50lighttpd restart
4952
fi
5053

51-
LIGHTTPD_SSL_CONF=/etc/lighttpd/lighttpd_ssl.conf
5254
if [ -f $LIGHTTPD_SSL_CONF ]
5355
then
5456
if ! grep -Fq "/etc/config/lighttpd/" $LIGHTTPD_SSL_CONF
@@ -62,7 +64,6 @@ Start () {
6264
fi
6365
fi
6466

65-
BACKUP_CGI=/www/config/cp_security.cgi
6667
if ! grep -Fq "exclude-tag=.nobackup" $BACKUP_CGI
6768
then
6869
echo "patching $BACKUP_CGI"
@@ -115,13 +116,28 @@ case "$1" in
115116

116117
uninstall)
117118
Stop
118-
$ADDON_DIR/bin/update_addon node-red
119-
$ADDON_DIR/bin/update_addon node-red-dashboard
119+
120120
$ADDON_DIR/bin/update_addon redmatic
121121
rm -r $ADDON_DIR
122122
rm -r $WWW_DIR
123123
rm $CONF_DIR/lighttpd/redmatic.conf
124124
rm $CONF_DIR/rc.d/redmatic
125+
126+
mount -o remount,rw /
127+
if [ -f $LIGHTTPD_CONF.orig ]
128+
then
129+
mv $LIGHTTPD_CONF.orig $LIGHTTPD_CONF
130+
fi
131+
if [ -f $LIGHTTPD_SSL_CONF.orig ]
132+
then
133+
mv $LIGHTTPD_SSL_CONF.orig $LIGHTTPD_SSL_CONF
134+
fi
135+
if [ -f $BACKUP_CGI.orig ]
136+
then
137+
mv $BACKUP_CGI.orig $BACKUP_CGI
138+
fi
139+
mount -o remount,ro /
140+
125141
logger -t redmatic -p daemon.info "Uninstalled RedMatic"
126142
;;
127143

0 commit comments

Comments
 (0)