Permalink
Browse files

use /mod/etc/default.* !#1 (refs #2145)

git-svn-id: file:///var/svn/freetz/trunk@10842 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent 3be9ca0 commit 2d3a6aebd76c81f83e0938555e9cc59a10acdade cuma committed Jul 19, 2013
Showing with 51 additions and 51 deletions.
  1. +1 −1 make/bftpd/files/root/usr/lib/cgi-bin/bftpd.cgi
  2. +1 −1 make/bind/files/root/etc/init.d/rc.bind
  3. +1 −1 make/dnsd-cgi/files/root/etc/init.d/rc.dnsd
  4. +1 −1 make/dtmfbox-cgi/files/root/usr/mww-dtmfbox-cgi/cgi-bin/dtmfbox_cfg.cgi
  5. +3 −3 make/dtmfbox/files/root/etc/init.d/rc.dtmfbox
  6. +1 −1 make/git/files/root/usr/lib/cgi-bin/git.cgi
  7. +1 −1 make/inetd/files/root/bin/inetdctl
  8. +1 −1 make/ngircd/files/root/etc/init.d/rc.ngircd
  9. +1 −1 make/oidentd/files/root/etc/init.d/rc.oidentd
  10. +1 −1 make/onlinechanged-cgi/files/root/etc/init.d/rc.onlinechanged
  11. +1 −1 make/openvpn-cgi/files/root/usr/lib/cgi-bin/openvpn.cgi
  12. +1 −1 make/openvpn-v2-cgi/files/root/usr/lib/cgi-bin/openvpn.cgi
  13. +1 −1 make/php/files/root/etc/init.d/rc.php
  14. +1 −1 make/ppp-cgi/files/root/etc/default.ppp/ppp_observer
  15. +4 −4 make/ppp-cgi/files/root/etc/init.d/rc.ppp
  16. +1 −1 make/pppd/files/root/etc/default.pppd/pppd_ip-down
  17. +3 −3 make/pppd/files/root/etc/init.d/rc.pppd
  18. +5 −5 make/pptp/files/root/etc/init.d/rc.pptp
  19. +4 −4 make/pptpd/files/root/etc/init.d/rc.pptpd
  20. +1 −1 make/rcapid/files/root/usr/lib/cgi-bin/rcapid.cgi
  21. +2 −2 make/sane-backends/files/root/etc/init.d/rc.sane-backends
  22. +2 −2 make/scanbuttond/files/root/etc/default.scanbuttond/scanbuttond.cfg
  23. +1 −1 make/scanbuttond/files/root/etc/init.d/rc.scanbuttond
  24. +1 −1 make/shellinabox/files/root/usr/lib/cgi-bin/shellinabox.cgi
  25. +1 −1 make/sslh/files/root/etc/init.d/rc.sslh
  26. +1 −1 make/subversion/files/root/usr/lib/cgi-bin/subversion.cgi
  27. +1 −1 make/tinc/files/root/etc/default.tinc/tinc.save
  28. +1 −1 make/tinc/files/root/etc/init.d/rc.tinc
  29. +1 −1 make/vnstat-cgi/files/root/etc/init.d/rc.vnstat
  30. +2 −2 make/vpnc/files/root/etc/init.d/rc.vpnc
  31. +1 −1 make/vsftpd/files/root/usr/lib/cgi-bin/vsftpd.cgi
  32. +3 −3 make/xmail/files/root/etc/init.d/rc.xmail
@@ -13,7 +13,7 @@ cat << EOF
<input id="e1" type="radio" name="enabled" value="yes"$auto_chk><label for="e1"> $(lang de:"Automatisch" en:"Automatic")</label>
<input id="e2" type="radio" name="enabled" value="no"$man_chk><label for="e2"> $(lang de:"Manuell" en:"Manual")</label>
EOF
-if [ -e "/etc/default.inetd/inetd.cfg" ]; then
+if [ -e "/mod/etc/default.inetd/inetd.cfg" ]; then
cat << EOF
<input id="e3" type="radio" name="enabled" value="inetd"$inetd_chk><label for="e3"> $(lang de:"Inetd" en:"Inetd")</label>
EOF
@@ -38,7 +38,7 @@ case $1 in
mkdir -p "/tmp/flash/${DAEMON}"
- [ ! -e "$DAEMON_CONFIG" ] && /etc/default.$DAEMON/${DAEMON_BIN}_conf > $DAEMON_CONFIG
+ [ ! -e "$DAEMON_CONFIG" ] && /mod/etc/default.$DAEMON/${DAEMON_BIN}_conf > $DAEMON_CONFIG
modreg cgi "$DAEMON" "Bind"
modreg daemon $DAEMON
@@ -12,7 +12,7 @@ case $1 in
""|load)
mkdir -p "/tmp/flash/${DAEMON}"
- [ ! -e "$DAEMON_CONFIG" ] && /etc/default.$DAEMON/${DAEMON}_conf > $DAEMON_CONFIG
+ [ ! -e "$DAEMON_CONFIG" ] && /mod/etc/default.$DAEMON/${DAEMON}_conf > $DAEMON_CONFIG
modreg cgi 'dnsd' 'dnsd'
modreg daemon $DAEMON
@@ -1,7 +1,7 @@
#!/bin/sh
DTMFBOX_VERSION="v0.5.0"
-if [ -d "/etc/default.dtmfbox" ]; then FREETZ="1"; else FREETZ="0"; fi # USB/Standalone=0 | Freetz=1
+if [ -d "/mod/etc/default.dtmfbox" ]; then FREETZ="1"; else FREETZ="0"; fi # USB/Standalone=0 | Freetz=1
let DTMFBOX_MAX_ACCOUNTS=10 # Max. accounts
let DTMFBOX_MAX_SAVE_LIMIT=61440 # Max. size of /var/flash/debug.cfg
@@ -23,7 +23,7 @@ fi
if [ "$DTMFBOX_INSTALLED" = "1" ]; then export PATH=$PATH:/var/dtmfbox; export LD_LIBRARY_PATH=/var/dtmfbox; fi
# Using Freez-Mod?
-if [ -d "/etc/default.dtmfbox" ]; then FREETZ="1"; else FREETZ="0"; fi
+if [ -d "/mod/etc/default.dtmfbox" ]; then FREETZ="1"; else FREETZ="0"; fi
# Check, if dtmfbox is already installed
#
@@ -293,11 +293,11 @@ install() {
ln -sf "/usr/sbin/dtmfbox" "$INSTALL_PATH/dtmfbox" 2>/dev/null
ln -sf "/usr/lib/libmenu.plugin.so" "$INSTALL_PATH/libmenu.plugin.so" 2>/dev/null
ln -sf "/mod/etc/init.d/rc.dtmfbox" "$INSTALL_PATH/rc.dtmfbox" 2>/dev/null
- ln -sf "/etc/default.dtmfbox" "$INSTALL_PATH/default" 2>/dev/null
+ ln -sf "/mod/etc/default.dtmfbox" "$INSTALL_PATH/default" 2>/dev/null
if [ ! -f "$INSTALL_PATH/dtmfbox" ]; then cp -f "/usr/sbin/dtmfbox" "$INSTALL_PATH"; fi
if [ ! -f "$INSTALL_PATH/libmenu.plugin.so" ]; then cp -f "/usr/lib/libmenu.plugin.so" "$INSTALL_PATH"; fi
if [ ! -f "$INSTALL_PATH/rc.dtmfbox" ]; then cp -f "/mod/etc/init.d/rc.dtmfbox" "$INSTALL_PATH"; fi
- if [ ! -d "$INSTALL_PATH/default" ]; then cp -Rf "/etc/default.dtmfbox" "$INSTALL_PATH/default"; fi
+ if [ ! -d "$INSTALL_PATH/default" ]; then cp -Rf "/mod/etc/default.dtmfbox" "$INSTALL_PATH/default"; fi
fi
echo "Restoring defaults ..."
@@ -11,7 +11,7 @@ cat << EOF
<input id="auto" type="radio" name="enabled" value="yes"$auto_chk><label for="auto"> $(lang de:"Automatisch" en:"Automatic")</label>
<input id="manual" type="radio" name="enabled" value="no"$man_chk><label for="manual"> $(lang de:"Manuell" en:"Manual")</label>
EOF
-if [ -e "/etc/default.inetd/inetd.cfg" ]; then
+if [ -e "/mod/etc/default.inetd/inetd.cfg" ]; then
cat << EOF
<input id="inetd" type="radio" name="enabled" value="inetd"$inetd_chk><label for="inetd"> $(lang de:"Inetd" en:"Inetd")</label>
EOF
@@ -9,5 +9,5 @@ usage()
# This script only controls AVM's ftpd and smbd but not Freetz samba/smbd.
[ "$1" != "enable" -a "$1" != "disable" ] && usage
[ "$2" != "ftpd" -a "$2" != "smbd" ] && usage
-[ -d /etc/default.$2 ] && /mod/etc/init.d/rc.$2 inetd_$1
+[ -d /mod/etc/default.$2 ] && /mod/etc/init.d/rc.$2 inetd_$1
@@ -11,7 +11,7 @@ start() {
case $1 in
""|load)
[ ! -d "/tmp/flash/$DAEMON" ] && mkdir -p /tmp/flash/$DAEMON
- [ ! -e "$DAEMON_CONFIG" ] && /etc/default.$DAEMON/ngircd_conf > $DAEMON_CONFIG
+ [ ! -e "$DAEMON_CONFIG" ] && /mod/etc/default.$DAEMON/ngircd_conf > $DAEMON_CONFIG
modreg cgi 'ngircd' 'ngIRCd'
modreg daemon $DAEMON
@@ -11,7 +11,7 @@ start() {
case $1 in
""|load)
[ ! -d "/tmp/flash/$DAEMON" ] && mkdir -p /tmp/flash/$DAEMON
- [ ! -e "$DAEMON_CONFIG" ] && /etc/default.$DAEMON/oidentd_conf > $DAEMON_CONFIG
+ [ ! -e "$DAEMON_CONFIG" ] && /mod/etc/default.$DAEMON/oidentd_conf > $DAEMON_CONFIG
modreg file $DAEMON conf 'oidentd.conf' 1 "oidentd_conf"
modreg cgi $DAEMON oidentd
@@ -9,7 +9,7 @@ case $1 in
modreg daemon --hide onlinechanged
echo -n 'Setting up onlinechanged scripting ... '
- [ ! -f /tmp/flash/$DAEMON-cgi ] && cp /etc/default.$DAEMON/$DAEMON-cgi /tmp/flash/
+ [ ! -f /tmp/flash/$DAEMON-cgi ] && cp /mod/etc/default.$DAEMON/$DAEMON-cgi /tmp/flash/
sh /tmp/flash/$DAEMON-cgi start
echo 'done.'
;;
@@ -136,7 +136,7 @@ cat << EOF
</td>
<td>
EOF
-if [ -e "/etc/default.inetd/inetd.cfg" -a $OPENVPN_CONFIG_COUNT -le 1 ]; then
+if [ -e "/mod/etc/default.inetd/inetd.cfg" -a $OPENVPN_CONFIG_COUNT -le 1 ]; then
cat << EOF
<input id="id_act_start_inet" type="radio" name="my_enabled" onclick='(local_autostart[act_conf]="inetd"); changeval();'>
<label for="id_act_start_inet">Inetd</label>
@@ -2,7 +2,7 @@
if $(echo "$QUERY_STRING" | grep -q genconfigname ); then
NAME=${QUERY_STRING##*genconfigname=}
- sh /etc/default.openvpn/generate_virtual_pkg "$NAME"
+ sh /mod/etc/default.openvpn/generate_virtual_pkg "$NAME"
sed -i "/$NAME/ d" /tmp/flash/openvpn/configs
echo "$NAME" >> /tmp/flash/openvpn/configs
fi
@@ -6,7 +6,7 @@
case $1 in
""|load)
[ ! -d /tmp/flash/$DAEMON ] && mkdir -p /tmp/flash/$DAEMON
- [ ! -e /tmp/flash/php.ini ] && cat /etc/default.$DAEMON/php.ini > /tmp/flash/php.ini
+ [ ! -e /tmp/flash/php.ini ] && cat /mod/etc/default.$DAEMON/php.ini > /tmp/flash/php.ini
modreg daemon --hide $DAEMON
modreg file $DAEMON config 'php.ini' 0 "php_config"
@@ -8,7 +8,7 @@
willkommen() {
[ "$PPP_FALLBACK" != 'yes' ] || echo -e "\n$(date): DIALIN" >> $PPP_FABALOG
- start-stop-daemon -n ppp_dialer -a /etc/default.ppp/ppp_dialer -b -q -S
+ start-stop-daemon -n ppp_dialer -a /mod/etc/default.ppp/ppp_dialer -b -q -S
}
bisbald () {
@@ -33,8 +33,8 @@ start() {
modprobe ppp-deflate
modprobe slhc
- start-stop-daemon -n ppp_observer -a /etc/default.ppp/ppp_observer -b -q -S
- [ -n "$PPP_DIAGTTY" ] && start-stop-daemon -n ppp_logger -a /etc/default.ppp/ppp_logger -b -q -S
+ start-stop-daemon -n ppp_observer -a /mod/etc/default.ppp/ppp_observer -b -q -S
+ [ -n "$PPP_DIAGTTY" ] && start-stop-daemon -n ppp_logger -a /mod/etc/default.ppp/ppp_logger -b -q -S
echo 'done.'
}
@@ -63,8 +63,8 @@ case $1 in
[ ! -d "/tmp/flash/ppp/peers" ] && mkdir -p /tmp/flash/ppp/peers
[ ! -e "/mod/etc/ppp/peers" ] && ln -s /tmp/flash/ppp/peers /mod/etc/ppp/peers
- [ ! -e "/tmp/flash/ppp/peers/dun" ] && /etc/default.${DAEMON}/peers_options > /tmp/flash/ppp/peers/dun
- [ ! -e "/tmp/flash/ppp/peers/dun.chat" ] && /etc/default.${DAEMON}/peers_chat > /tmp/flash/ppp/peers/dun.chat
+ [ ! -e "/tmp/flash/ppp/peers/dun" ] && /mod/etc/default.${DAEMON}/peers_options > /tmp/flash/ppp/peers/dun
+ [ ! -e "/tmp/flash/ppp/peers/dun.chat" ] && /mod/etc/default.${DAEMON}/peers_chat > /tmp/flash/ppp/peers/dun.chat
modreg cgi 'ppp' 'PPP'
modreg daemon $DAEMON
@@ -24,7 +24,7 @@ cat << EOF
if [ -x "/var/tmp/flash/ppp/pptp_restart" ]; then
/var/tmp/flash/ppp/pptp_restart &
else
- /etc/default.pptp/pptp_restart &
+ /mod/etc/default.pptp/pptp_restart &
fi
fi
EOF
@@ -7,9 +7,9 @@ case $1 in
[ ! -d "/tmp/flash/ppp" ] && mkdir -p /tmp/flash/ppp
[ ! -d "/mod/etc/ppp" ] && mkdir -p /mod/etc/ppp
- [ ! -e "/tmp/flash/ppp/chap-secrets" -a ! -e /tmp/flash/ppp/chap-secrets ] && /etc/default.pppd/chap_secrets > /tmp/flash/ppp/chap-secrets
- #[ ! -e "/tmp/flash/ppp/pap-secrets" -a ! -e /tmp/flash/ppp/pap-secrets ] && /etc/default.pppd/pap_secrets > /tmp/flash/ppp/pap-secrets
- #[ ! -e "/tmp/flash/ppp/options" -a ! -e /tmp/flash/ppp/options ] && /etc/default.pppd/pppd_options > /tmp/flash/ppp/options
+ [ ! -e "/tmp/flash/ppp/chap-secrets" -a ! -e /tmp/flash/ppp/chap-secrets ] && /mod/etc/default.pppd/chap_secrets > /tmp/flash/ppp/chap-secrets
+ #[ ! -e "/tmp/flash/ppp/pap-secrets" -a ! -e /tmp/flash/ppp/pap-secrets ] && /mod/etc/default.pppd/pap_secrets > /tmp/flash/ppp/pap-secrets
+ #[ ! -e "/tmp/flash/ppp/options" -a ! -e /tmp/flash/ppp/options ] && /mod/etc/default.pppd/pppd_options > /tmp/flash/ppp/options
[ -e "/tmp/flash/ppp/chap-secrets" -a ! -e /mod/etc/ppp/chap-secrets ] && ln -s /tmp/flash/ppp/chap-secrets /mod/etc/ppp/chap-secrets
#[ -e "/tmp/flash/ppp/pap-secrets" -a ! -e /mod/etc/ppp/pap-secrets ] && ln -s /tmp/flash/ppp/pap_secrets /mod/etc/ppp/pap-secrets
@@ -16,11 +16,11 @@ start() {
rm -f /mod/etc/ppp/ip-up
rm -f /mod/etc/ppp/ip-down
[ -x /tmp/flash/ppp/peers/pptp_peer ] && /tmp/flash/ppp/peers/pptp_peer > /mod/etc/ppp/peers/pptp
- [ ! -e /mod/etc/ppp/peers/pptp ] && /etc/default.${DAEMON}/pptp_peer > /mod/etc/ppp/peers/pptp
+ [ ! -e /mod/etc/ppp/peers/pptp ] && /mod/etc/default.${DAEMON}/pptp_peer > /mod/etc/ppp/peers/pptp
[ -x /tmp/flash/ppp/pppd_ip-up ] && /tmp/flash/ppp/pppd_ip-up > /mod/etc/ppp/ip-up
- [ ! -e /mod/etc/ppp/ip-up ] && /etc/default.pppd/pppd_ip-up > /mod/etc/ppp/ip-up
+ [ ! -e /mod/etc/ppp/ip-up ] && /mod/etc/default.pppd/pppd_ip-up > /mod/etc/ppp/ip-up
[ -x /tmp/flash/ppp/pppd_ip-down ] && /tmp/flash/ppp/pppd_ip-down > /mod/etc/ppp/ip-down
- [ ! -e /mod/etc/ppp/ip-down ] && /etc/default.pppd/pppd_ip-down > /mod/etc/ppp/ip-down
+ [ ! -e /mod/etc/ppp/ip-down ] && /mod/etc/default.pppd/pppd_ip-down > /mod/etc/ppp/ip-down
chmod 755 /mod/etc/ppp/ip-up
chmod 755 /mod/etc/ppp/ip-down
@@ -50,7 +50,7 @@ start() {
if [ -x /var/tmp/flash/ppp/pptp_restart ]; then
/var/tmp/flash/ppp/pptp_restart &
else
- /etc/default.pptp/pptp_restart &
+ /mod/etc/default.pptp/pptp_restart &
fi
exitval=$?
if [ "$exitval" -eq 0 ]; then
@@ -92,7 +92,7 @@ case $1 in
[ ! -d /tmp/flash/ppp ] && mkdir -p /tmp/flash/ppp
[ ! -d /mod/etc/ppp/peers ] && mkdir -p /mod/etc/ppp/peers
- [ ! -e /tmp/flash/ppp/options.pptp ] && /etc/default.${DAEMON}/pptp_options > /tmp/flash/ppp/options.pptp
+ [ ! -e /tmp/flash/ppp/options.pptp ] && /mod/etc/default.${DAEMON}/pptp_options > /tmp/flash/ppp/options.pptp
[ -e /tmp/flash/ppp/options.pptp -a ! -e /mod/etc/ppp/options.pptp ] && ln -s /tmp/flash/ppp/options.pptp /mod/etc/ppp/options.pptp
modreg cgi 'pptp' 'PPTP'
@@ -8,9 +8,9 @@ config() {
rm -f /mod/etc/ppp/ip-up
rm -f /mod/etc/ppp/ip-down
[ -x "/tmp/flash/ppp/pppd_ip-up" ] && /tmp/flash/ppp/pppd_ip-up > /mod/etc/ppp/ip-up
- [ ! -e "/mod/etc/ppp/ip-up" ] && /etc/default.pppd/pppd_ip-up > /mod/etc/ppp/ip-up
+ [ ! -e "/mod/etc/ppp/ip-up" ] && /mod/etc/default.pppd/pppd_ip-up > /mod/etc/ppp/ip-up
[ -x "/tmp/flash/ppp/pppd_ip-down" ] && /tmp/flash/ppp/pppd_ip-down > /mod/etc/ppp/ip-down
- [ ! -e "/mod/etc/ppp/ip-down" ] && /etc/default.pppd/pppd_ip-down > /mod/etc/ppp/ip-down
+ [ ! -e "/mod/etc/ppp/ip-down" ] && /mod/etc/default.pppd/pppd_ip-down > /mod/etc/ppp/ip-down
chmod 755 /mod/etc/ppp/ip-up
chmod 755 /mod/etc/ppp/ip-down
}
@@ -35,8 +35,8 @@ case $1 in
[ ! -d "/tmp/flash/ppp" ] && mkdir -p /tmp/flash/ppp
[ ! -d "/mod/etc/ppp" ] && mkdir -p /mod/etc/ppp
- [ ! -e "/tmp/flash/ppp/options.pptpd" ] && /etc/default.${DAEMON}/pptpd_options > /tmp/flash/ppp/options.pptpd
- [ ! -e "/tmp/flash/ppp/pptpd.conf" ] && /etc/default.${DAEMON}/pptpd_conf > /tmp/flash/ppp/pptpd.conf
+ [ ! -e "/tmp/flash/ppp/options.pptpd" ] && /mod/etc/default.${DAEMON}/pptpd_options > /tmp/flash/ppp/options.pptpd
+ [ ! -e "/tmp/flash/ppp/pptpd.conf" ] && /mod/etc/default.${DAEMON}/pptpd_conf > /tmp/flash/ppp/pptpd.conf
[ ! -e "/mod/etc/ppp/options.pptpd" ] && ln -s /tmp/flash/ppp/options.pptpd /mod/etc/ppp/options.pptpd
[ ! -e "/mod/etc/ppp/pptpd.conf" ] && ln -s /tmp/flash/ppp/pptpd.conf /mod/etc/ppp/pptpd.conf
@@ -11,7 +11,7 @@ cat << EOF
<p>
<input id="e2" type="radio" name="enabled" value="no"$disabled_chk><label for="e2"> $(lang de:"Deaktiviert" en:"Disabled")</label>
EOF
-if [ -e "/etc/default.inetd/inetd.cfg" ]; then
+if [ -e "/mod/etc/default.inetd/inetd.cfg" ]; then
cat << EOF
<input id="e3" type="radio" name="enabled" value="inetd"$inetd_chk><label for="e3"> $(lang de:"Inetd" en:"Inetd")</label>
EOF
@@ -18,10 +18,10 @@ start() {
case $1 in
""|load)
[ ! -d $CONFDIR/dll.d ] && mkdir -p $CONFDIR/dll.d
- for conf in /etc/default.$DAEMON/*.conf; do
+ for conf in /mod/etc/default.$DAEMON/*.conf; do
[ -e $conf ] && ln -sf $conf $CONFDIR/$(basename $conf)
done
- for conf in /etc/default.$DAEMON/dll.d/*; do
+ for conf in /mod/etc/default.$DAEMON/dll.d/*; do
[ -e $conf ] && ln -sf $conf $CONFDIR/dll.d/$(basename $conf)
done
@@ -1,3 +1,3 @@
export SCANBUTTOND_ENABLED='no'
-export SCANBUTTOND_BUTTONPRESSED_SCRIPT="$(cat /etc/default.scanbuttond/buttonpressed.sh.example)"
-export SCANBUTTOND_INITSCANNER_SCRIPT="$(cat /etc/default.scanbuttond/initscanner.sh.example)"
+export SCANBUTTOND_BUTTONPRESSED_SCRIPT="$(cat /mod/etc/default.scanbuttond/buttonpressed.sh.example)"
+export SCANBUTTOND_INITSCANNER_SCRIPT="$(cat /mod/etc/default.scanbuttond/initscanner.sh.example)"
@@ -7,7 +7,7 @@ DAEMON_LONG_NAME="ScanButton daemon"
config() {
local CONFDIR=/mod/etc/scanbuttond
[ ! -d $CONFDIR ] && mkdir -p $CONFDIR
- [ ! -e $CONFDIR/meta.conf ] && ln -sf /etc/default.scanbuttond/meta.conf $CONFDIR/meta.conf
+ [ ! -e $CONFDIR/meta.conf ] && ln -sf /mod/etc/default.scanbuttond/meta.conf $CONFDIR/meta.conf
echo "$SCANBUTTOND_BUTTONPRESSED_SCRIPT" > $CONFDIR/buttonpressed.sh
echo "$SCANBUTTOND_INITSCANNER_SCRIPT" > $CONFDIR/initscanner.sh
chmod +x $CONFDIR/*.sh
@@ -1,7 +1,7 @@
#!/bin/sh
if $(echo "$QUERY_STRING" | grep -q dogencert ); then
- sh /etc/default.shellinabox/generate_cert.sh
+ sh /mod/etc/default.shellinabox/generate_cert.sh
echo '<textarea id="certout">'
cat /tmp/shellinabox_certificate.pem
echo '</textarea>'
@@ -16,7 +16,7 @@ start() {
case $1 in
""|load)
[ ! -d /tmp/flash/$DAEMON ] && mkdir -p /tmp/flash/$DAEMON
- [ ! -e /tmp/flash/$DAEMON/protocols ] && /etc/default.sslh/default-config.sh
+ [ ! -e /tmp/flash/$DAEMON/protocols ] && /mod/etc/default.sslh/default-config.sh
modlib_add_user_and_group nobody
@@ -12,7 +12,7 @@ cat << EOF
<input id="auto" type="radio" name="enabled" value="yes"$auto_chk><label for="auto"> $(lang de:"Automatisch" en:"Automatic")</label>
<input id="manual" type="radio" name="enabled" value="no"$man_chk><label for="manual"> $(lang de:"Manuell" en:"Manual")</label>
EOF
-if [ -e "/etc/default.inetd/inetd.cfg" ]; then
+if [ -e "/mod/etc/default.inetd/inetd.cfg" ]; then
cat << EOF
<input id="inetd" type="radio" name="enabled" value="inetd"$inetd_chk><label for="inetd"> $(lang de:"Inetd" en:"Inetd")</label>
EOF
@@ -1,4 +1,4 @@
pkg_post_save() {
# fill new server files with default content
- /etc/default.tinc/default-config.sh
+ /mod/etc/default.tinc/default-config.sh
}
@@ -35,7 +35,7 @@ case $1 in
[ ! -d "/tmp/flash/$DAEMON/hosts" ] && mkdir -p /tmp/flash/$DAEMON/hosts
rm -rf "/tmp/flash/$DAEMON/$DAEMON.conf" 2>/dev/null
ln -s "/mod/etc/$DAEMON.conf" "/tmp/flash/$DAEMON/$DAEMON.conf"
- /etc/default.tinc/default-config.sh
+ /mod/etc/default.tinc/default-config.sh
modreg file $DAEMON server1 Server1 1 server1
modreg file $DAEMON server2 Server2 1 server2
@@ -75,7 +75,7 @@ case $1 in
modlib_add_httpd_symlink vns
[ ! -d "/tmp/flash/vnstat" ] && mkdir -p /tmp/flash/vnstat
- [ ! -e "/tmp/flash/vnstat/vnstat.conf" ] && /etc/default.vnstat/vnstat_conf > /tmp/flash/vnstat/vnstat.conf
+ [ ! -e "/tmp/flash/vnstat/vnstat.conf" ] && /mod/etc/default.vnstat/vnstat_conf > /tmp/flash/vnstat/vnstat.conf
modreg file vnstat conf 'vnstat.conf' 1 "vnstat_conf"
modreg cgi vnstat vnstat
@@ -15,11 +15,11 @@ start() {
MASK=$(grep mask /var/mod/etc/vpnc.conf | sed -e 's/#mask //g')
if [ $NETWORK != "0.0.0.0" ]; then
- sed -e 's/#set -x/INTERNAL_IP4_DNS=\nCISCO_SPLIT_INC=1\nCISCO_SPLIT_INC_0_ADDR='$NETWORK'\nCISCO_SPLIT_INC_0_MASK='$MASK'\nCISCO_SPLIT_INC_0_MASKLEN=22\nCISCO_SPLIT_INC_0_PROTOCOL=0\nCISCO_SPLIT_INC_0_SPORT=0\nCISCO_SPLIT_INC_0_DPORT=0\n\n#set -x\n/g' /etc/default.vpnc/vpnc-script > /var/tmp/vpnc-script
+ sed -e 's/#set -x/INTERNAL_IP4_DNS=\nCISCO_SPLIT_INC=1\nCISCO_SPLIT_INC_0_ADDR='$NETWORK'\nCISCO_SPLIT_INC_0_MASK='$MASK'\nCISCO_SPLIT_INC_0_MASKLEN=22\nCISCO_SPLIT_INC_0_PROTOCOL=0\nCISCO_SPLIT_INC_0_SPORT=0\nCISCO_SPLIT_INC_0_DPORT=0\n\n#set -x\n/g' /mod/etc/default.vpnc/vpnc-script > /var/tmp/vpnc-script
chmod +x /var/tmp/vpnc-script
VPNC_SCRIPT="/var/tmp/vpnc-script"
else
- VPNC_SCRIPT="/etc/default.vpnc/vpnc-script"
+ VPNC_SCRIPT="/mod/etc/default.vpnc/vpnc-script"
fi
modlib_startdaemon $DAEMON --script $VPNC_SCRIPT /mod/etc/$DAEMON.conf
@@ -31,7 +31,7 @@ cat << EOF
<input id="e1" type="radio" name="enabled" value="yes"$auto_chk><label for="e1"> $(lang de:"Automatisch" en:"Automatic")</label>
<input id="e2" type="radio" name="enabled" value="no"$man_chk><label for="e2"> $(lang de:"Manuell" en:"Manual")</label>
EOF
-if [ -e "/etc/default.inetd/inetd.cfg" ]; then
+if [ -e "/mod/etc/default.inetd/inetd.cfg" ]; then
cat << EOF
<input id="e3" type="radio" name="enabled" value="inetd"$inetd_chk><label for="e3"> $(lang de:"Inetd" en:"Inetd")</label>
EOF
@@ -39,13 +39,13 @@ configure() {
fi
if [ ! -e "$XMAIL_MAILLOCATION/server.tab" ]; then
echo -n 'initialzing mail location folder with default values ... '
- tar -C $XMAIL_MAILLOCATION -xf /etc/default.$DAEMON/default_config/default_config.tar
+ tar -C $XMAIL_MAILLOCATION -xf /mod/etc/default.$DAEMON/default_config/default_config.tar
echo 'done.'
else
- for i in $(tar -tf /etc/default.$DAEMON/default_config/default_config.tar); do
+ for i in $(tar -tf /mod/etc/default.$DAEMON/default_config/default_config.tar); do
[ "${i:0:2}" == "./" ] && ii=${i:2}
[ ! -z "$ii" ] && [ ! -e "$XMAIL_MAILLOCATION/$ii" ] && tar -C $XMAIL_MAILLOCATION \
- -xf /etc/default.$DAEMON/default_config/default_config.tar $i
+ -xf /mod/etc/default.$DAEMON/default_config/default_config.tar $i
done
fi
[ -e "$XMAIL_MAILLOCATION/tmp" ] || mkdir $XMAIL_MAILLOCATION/tmp

0 comments on commit 2d3a6ae

Please sign in to comment.