Skip to content

Commit 9dd89e3

Browse files
committed
Fix Icecast for DSM 7.0
1 parent 6dd0edd commit 9dd89e3

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

spk/icecast/src/icecast.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,14 @@
191191

192192
<paths>
193193
<!-- basedir is only used if chroot is enabled -->
194-
<basedir>/usr/local/icecast/share/icecast</basedir>
194+
<basedir>/var/packages/icecast/target/share/icecast</basedir>
195195

196196
<!-- Note that if <chroot> is turned on below, these paths must both
197197
be relative to the new root, not the original root -->
198-
<logdir>/usr/local/icecast/var/log</logdir>
199-
<webroot>/usr/local/icecast/share/icecast/web</webroot>
200-
<adminroot>/usr/local/icecast/share/icecast/admin</adminroot>
201-
<pidfile>/usr/local/icecast/var/icecast.pid</pidfile>
198+
<logdir>/var/packages/icecast/var/log</logdir>
199+
<webroot>/var/packages/icecast/target/share/icecast/web</webroot>
200+
<adminroot>/var/packages/icecast/target/share/icecast/admin</adminroot>
201+
<pidfile>/var/packages/icecast/var/icecast.pid</pidfile>
202202

203203
<!-- Aliases: treat requests for 'source' path as being for 'dest' path
204204
May be made specific to a port or bound address using the "port"
@@ -214,7 +214,7 @@
214214
<alias source="/" destination="/status.xsl"/>
215215
<!-- The certificate file needs to contain both public and private part.
216216
Both should be PEM encoded.
217-
<ssl-certificate>/usr/local/share/icecast/icecast.pem</ssl-certificate>
217+
<ssl-certificate>/var/packages/icecast/var/icecast.pem</ssl-certificate>
218218
-->
219219
</paths>
220220

spk/icecast/src/service-setup.sh

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ service_postinst ()
1010
# Edit the configuration according to the wizard
1111
sed -i -e "s/@username@/${wizard_ic_username:=admin}/g" ${CFG_FILE}
1212
sed -i -e "s/@password@/${wizard_ic_password:=changepassword}/g" ${CFG_FILE}
13+
if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then
14+
sed -i -e "s|/var/packages/icecast/var|/var/packages/icecast/target/var|g" ${CFG_FILE}
15+
fi
1316
}
1417

1518

0 commit comments

Comments
 (0)