Skip to content

Commit 80677b6

Browse files
TommyE123TommyE123
authored
Merge pull request #242 from TommyE123/master
- `Madsonic`, `Subsonic`, `Deluge`, `pyLoad`, `qBittorrent` required minor improvements to the configs. - Fixed `Madsonic` and `Subsonic` on old init.d scripts. - Removed `SickGear` and `Resilio-sync` from the CI tests as they fail because the services dont currently support it. - Fixed rare issue which could display the wrong link when enabling Reverse Proxies. - Fixed minor link test error in CI for `ubooquity` - Fixed Minor Menu error for `Certbot`.
2 parents c43beb8 + bbda7b3 commit 80677b6

12 files changed

+43
-17
lines changed

‎batch-processes/bat-apps-install-uninstall.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ source "$SCRIPTPATH/setup.sh" -u rclone
8585
source "$SCRIPTPATH/setup.sh" -i rclone-browser
8686
source "$SCRIPTPATH/setup.sh" -u rclone-browser
8787
source "$SCRIPTPATH/setup.sh" -i resilio-sync
88-
source "$SCRIPTPATH/setup.sh" -x resilio-sync
88+
# source "$SCRIPTPATH/setup.sh" -x resilio-sync
8989
source "$SCRIPTPATH/setup.sh" -u resilio-sync
9090
source "$SCRIPTPATH/setup.sh" -i rtorrent
9191
source "$SCRIPTPATH/setup.sh" -u rtorrent
9292
source "$SCRIPTPATH/setup.sh" -i sabnzbdplus
9393
source "$SCRIPTPATH/setup.sh" -x sabnzbdplus
9494
source "$SCRIPTPATH/setup.sh" -u sabnzbdplus
9595
source "$SCRIPTPATH/setup.sh" -i sickgear
96-
source "$SCRIPTPATH/setup.sh" -x sickgear
96+
# source "$SCRIPTPATH/setup.sh" -x sickgear
9797
source "$SCRIPTPATH/setup.sh" -u sickgear
9898
source "$SCRIPTPATH/setup.sh" -i sickrage
9999
source "$SCRIPTPATH/setup.sh" -x sickrage
@@ -111,6 +111,7 @@ source "$SCRIPTPATH/setup.sh" -i transmission-daemon
111111
source "$SCRIPTPATH/setup.sh" -x transmission-daemon
112112
source "$SCRIPTPATH/setup.sh" -u transmission-daemon
113113
source "$SCRIPTPATH/setup.sh" -i ubooquity
114+
APPDPORT='2203/ubooquity/admin'
114115
source "$SCRIPTPATH/setup.sh" -x ubooquity
115116
source "$SCRIPTPATH/setup.sh" -u ubooquity
116117
source "$SCRIPTPATH/setup.sh" -i watcher

‎inc/app-constant-reset.sh

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ NZBGET_CONF=''
4141
PASSSEARCH=''
4242
PID_FILE=''
4343
PORTSEARCH=''
44+
PROXYREQSUFFIX=''
4445
REPKEYSERVER=''
4546
REPOKEYSREQ=''
4647
REPOPPA=''

‎madsonic/madsonic-reverse-proxy-disable.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
# Publisher: http://www.htpcBeginner.com
55
# License: MIT License (refer to README.md for more details)
66

7-
if sed -i "/ExecStart=\\/usr\\/bin\\/madsonic/c\\ExecStart=\\/usr\\/bin\\/madsonic" "/etc/systemd/system/$APPSYSTEMD"; then
8-
echo "Updated context-path in /etc/systemd/system/$APPSYSTEMD"
7+
if IsSystemdSupported; then
8+
if sed -i "/ExecStart=\\/usr\\/bin\\/madsonic/c\\ExecStart=\\/usr\\/bin\\/madsonic" "/etc/systemd/system/$APPSYSTEMD"; then
9+
echo "Updated context-path in /etc/systemd/system/$APPSYSTEMD"
10+
fi
11+
else
12+
if sed -i "s@^MADSONIC_ARGS.*@MADSONIC_ARGS=\"--init-memory=256 --max-memory=512\"@g" "/etc/default/$APPNAME"; then
13+
echo "Updated context-path in /etc/default/$APPNAME"
14+
fi
915
fi
1016

1117
sudo systemctl daemon-reload

‎madsonic/madsonic-reverse-proxy-enable.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
#!/bin/bash
2+
# shellcheck disable=SC1090
23
# Script Name: AtoMiC Madsonic Reverse Proxy Enable.
34
# Author: TommyE123
45
# Publisher: http://www.htpcBeginner.com
56
# License: MIT License (refer to README.md for more details)
67

7-
if sed -i "/ExecStart=\\/usr\\/bin\\/madsonic/c\\ExecStart=\\/usr\\/bin\\/madsonic --context-path=\\/madsonic" "/etc/systemd/system/$APPSYSTEMD"; then
8-
echo "Updated context-path in /etc/systemd/system/$APPSYSTEMD"
8+
if IsSystemdSupported; then
9+
if sed -i "/ExecStart=\\/usr\\/bin\\/madsonic/c\\ExecStart=\\/usr\\/bin\\/madsonic --context-path=\\/madsonic" "/etc/systemd/system/$APPSYSTEMD"; then
10+
echo "Updated context-path in /etc/systemd/system/$APPSYSTEMD"
11+
fi
12+
else
13+
if sed -i "s@^MADSONIC_ARGS.*@MADSONIC_ARGS=\"--context-path=\\/madsonic --init-memory=256 --max-memory=512\"@g" "/etc/default/$APPNAME"; then
14+
echo "Updated context-path in /etc/default/$APPNAME"
15+
fi
916
fi
1017

1118
sudo systemctl daemon-reload

‎subsonic/subsonic-constants.sh

+1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ NEWPASS='atomic'
1313
# New password unencrypted
1414
APPNEWPASS='atomic'
1515
APPSYSTEMD='subsonic.service'
16+
APPINITD='subsonic'
1617
APPSYSTEMDLOC=$SCRIPTPATH'/subsonic/'$APPSYSTEMD

‎subsonic/subsonic-reverse-proxy-disable.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
# Publisher: http://www.htpcBeginner.com
55
# License: MIT License (refer to README.md for more details)
66

7-
if sed -i "/ExecStart=\\/usr\\/bin\\/subsonic/c\\ExecStart=\\/usr\\/bin\\/subsonic" "/etc/systemd/system/$APPSYSTEMD"; then
8-
echo "Updated context-path in /etc/systemd/system/$APPSYSTEMD"
7+
if IsSystemdSupported; then
8+
if sed -i "/ExecStart=\\/usr\\/bin\\/subsonic/c\\ExecStart=\\/usr\\/bin\\/subsonic" "/etc/systemd/system/$APPSYSTEMD"; then
9+
echo "Updated context-path in /etc/systemd/system/$APPSYSTEMD"
10+
fi
11+
else
12+
if sed -i "s@^SUBSONIC_ARGS.*@SUBSONIC_ARGS=\"--max-memory=500\"@g" "/etc/default/$APPNAME"; then
13+
echo "Updated context-path in /etc/default/$APPNAME"
14+
fi
915
fi
1016

1117
sudo systemctl daemon-reload

‎subsonic/subsonic-reverse-proxy-enable.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
# Publisher: http://www.htpcBeginner.com
55
# License: MIT License (refer to README.md for more details)
66

7-
if sed -i "/ExecStart=\\/usr\\/bin\\/subsonic/c\\ExecStart=\\/usr\\/bin\\/subsonic --context-path=\\/subsonic" "/etc/systemd/system/$APPSYSTEMD"; then
8-
echo "Updated context-path in /etc/systemd/system/$APPSYSTEMD"
7+
if IsSystemdSupported; then
8+
if sed -i "/ExecStart=\\/usr\\/bin\\/subsonic/c\\ExecStart=\\/usr\\/bin\\/subsonic --context-path=\\/subsonic" "/etc/systemd/system/$APPSYSTEMD"; then
9+
echo "Updated context-path in /etc/systemd/system/$APPSYSTEMD"
10+
fi
11+
else
12+
if sed -i "s@^SUBSONIC_ARGS.*@SUBSONIC_ARGS=\"--context-path=\\/subsonic --max-memory=500\"@g" "/etc/default/subsonic"; then
13+
echo "Updated context-path in /etc/default/subsonic"
14+
fi
915
fi
1016

1117
sudo systemctl daemon-reload

‎utils/certbot/certbot-menu.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if [[ $exitstatus = 0 ]]; then
2727
APPNAME='certbot'
2828
source "$SCRIPTPATH/inc/app-restore-controller.sh" ;;
2929
"Go Back" )
30-
source "$SCRIPTPATH/utils/utils/utils-menu.sh" ;;
30+
source "$SCRIPTPATH/utils/utils-menu.sh" ;;
3131
*)
3232
source "$SCRIPTPATH/inc/invalid-option.sh" ;;
3333
esac

‎utils/nginx/locations-available/deluge.atomic.conf

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Version=1.0
22
location /deluge/ {
3-
proxy_pass http://localhost:8112/;
4-
proxy_set_header X-Deluge-Base "/deluge/";
5-
add_header X-Frame-Options SAMEORIGIN;
3+
proxy_pass http://127.0.0.1:8112/;
4+
proxy_set_header X-Deluge-Base "/deluge/";
65
}

‎utils/nginx/locations-available/glances.atomic.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Version=1.0
22
location /glances/ {
33
rewrite /glances/(.*) /$1 break;
4-
proxy_pass http://127.0.0.1:61208/;
4+
proxy_pass http://127.0.0.1:61208;
55
proxy_set_header Host $http_host;
66
}

‎utils/nginx/locations-available/pyload.atomic.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Version=1.0
22
location /pyload/ {
3-
proxy_pass http://localhost:8000/;
3+
proxy_pass http://127.0.0.1:8000/;
44
proxy_set_header Accept-Encoding "";
55
sub_filter_types text/css text/xml text/javascript;
66
sub_filter 'media/' 'pyload/media/';

‎utils/nginx/locations-available/qbittorrent.atomic.conf

-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ location ~ /qbittorrent/(?<url>.*)
1212
proxy_hide_header Origin;
1313
proxy_set_header Referer '';
1414
proxy_set_header Origin '';
15-
add_header X-Frame-Options "SAMEORIGIN";
1615
}

0 commit comments

Comments
 (0)