Changeset 3318


Ignorieren:
Zeitstempel:
10.05.2009 14:59:41 (vor 9 Jahren)
Autor:
oliver
Nachricht:
  • Move packages config files into folders (/tmp/flash)
    • mod, dnsmasq, dropbear, knock, nfsd, privoxy
  • Add editable .profile for root
  • Make resolv.conf editable over webinterface (by cuma)
Ort:
trunk
Dateien:
4 hinzugefügt
1 gelöscht
30 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/.language

    r3018 r3318  
    55files 
    66{ 
    7     etc/default.mod/exhosts.def 
     7    etc/default.mod/_profile.def 
     8    etc/default.mod/crontab.def 
     9    etc/default.mod/hosts.def 
     10    etc/default.mod/modules.def 
    811    etc/default.mod/rc_custom.def 
    9     etc/default.mod/modules.def 
     12    etc/default.mod/resolv_conf.def 
    1013    usr/lib/libmodcgi.sh 
    1114    usr/lib/libmodfrm.sh 
  • trunk/fwmod

    r3277 r3318  
    719719 
    720720        mkdir -p "$MOD_CRON" 
    721         mkdir -p "${MOD_ROOT}/pkg" "${MOD_ROOT}/home" "${MOD_ROOT}/lib" "${MOD_ROOT}/root"  
     721        mkdir -p "${MOD_ROOT}/pkg" "${MOD_ROOT}/home" "${MOD_ROOT}/lib" "${MOD_ROOT}/root" 
    722722        mkdir -p "${MOD_ROOT}/bin" "${MOD_ROOT}/sbin" 
    723723        mkdir -p "${MOD_ROOT}/var/cache" 
     
    725725            "${MOD_ROOT}/usr/lib" "${MOD_ROOT}/usr/lib/cgi-bin" 
    726726        mkdir -p "${MOD_ROOT}/etc/conf" "${MOD_ROOT}/etc/init.d" "${MOD_ROOT}/etc/reg" 
     727        ln -s /tmp/flash/mod/.profile "${MOD_ROOT}/root/.profile" 
    727728        # AVM compatibility symlink 
    728729        ln -s ../sys "${VARTAR_MOD_DIR}/var/sysfs" 
  • trunk/make/dnsmasq/files/root/etc/default.dnsmasq/dnsmasq_conf

    r2392 r3318  
    3131    echo $1 | grep '^dhcp-host$' >/dev/null 
    3232} 
    33 if [ -r /tmp/flash/exhosts ]; then 
    34     egrep -v '^(#|[[:space:]]*$)' /tmp/flash/exhosts | 
     33[ -r /tmp/flash/exhosts ] && mv /tmp/flash/exhosts /tmp/flash/mod/hosts 
     34if [ -r /tmp/flash/mod/hosts ]; then 
     35    egrep -v '^(#|[[:space:]]*$)' /tmp/flash/mod/hosts | 
    3536        while read -r ip mac interface host desc; do 
    3637            isdhcphost $mac && echo "dhcp-host=${host}" 
  • trunk/make/dnsmasq/files/root/etc/default.dnsmasq/dnsmasq_extra.def

    r3019 r3318  
    1 CAPTION='$(lang de:"Experten Optionen des Dnsmasq Servers" en:"Dnsmasq: Advanced options")' 
    2 DESCRIPTION='$(lang de:"Optional. Dnsmasq typische Syntax" en:"Optional, Dnsmasq typical syntax")' 
    3 CONFIG_FILE='/tmp/flash/dnsmasq.extra' 
     1CAPTION='Dnsmasq: $(lang de:"Experten Optionen" en:"Advanced options")' 
     2DESCRIPTION='$(lang de:"Optional. Dnsmasq typische Syntax" en:"Optional. Dnsmasq typical syntax")' 
     3CONFIG_FILE='/tmp/flash/dnsmasq/dnsmasq.extra' 
    44CONFIG_SAVE='modsave flash; /etc/init.d/rc.dnsmasq restart' 
    55CONFIG_TYPE='text' 
  • trunk/make/dnsmasq/files/root/etc/init.d/rc.dnsmasq

    r3150 r3318  
    3333        fi 
    3434 
    35         if [ -r "/tmp/flash/${DAEMON}.extra" ]; then 
    36             cat /tmp/flash/${DAEMON}.extra 
     35        if [ -r "/tmp/flash/${DAEMON}/${DAEMON}.extra" ]; then 
     36            cat /tmp/flash/${DAEMON}/${DAEMON}.extra 
    3737        fi 
    3838    ) > /mod/etc/$DAEMON.conf 
     
    109109case "$1" in 
    110110        ""|load) 
     111        mkdir -p "/tmp/flash/${DAEMON}" 
     112        [ -r "/tmp/flash/${DAEMON}.extra" ] && mv "/tmp/flash/${DAEMON}.extra" "/tmp/flash/${DAEMON}/${DAEMON}.extra" 
     113 
    111114        modreg cgi 'dnsmasq' 'Dnsmasq' 
    112115         
    113116        deffile='/mod/etc/default.dnsmasq/dnsmasq_extra.def' 
    114         [ -r "/tmp/flash/dnsmasq_extra.def" ] && deffile='/tmp/flash/dnsmasq_extra.def' 
    115         modreg file 'dnsmasq_extra' 'Dnsmasq-Extra' 0 "$deffile" 
     117        [ -r "/tmp/flash/dnsmasq/dnsmasq_extra.def" ] && deffile='/tmp/flash/dnsmasq/dnsmasq_extra.def' 
     118        modreg file 'dnsmasq__extra' 'Dnsmasq: extra' 0 "$deffile" 
    116119 
    117120        if [ "$DNSMASQ_ENABLED" != "yes" ]; then 
     
    132135    unload) 
    133136        stop 
     137        modunreg file 'dnsmasq__extra' 
    134138        modunreg cgi 'dnsmasq' 
    135139        ;; 
  • trunk/make/dnsmasq/files/root/usr/lib/cgi-bin/dnsmasq.cgi

    r2162 r3318  
    4545<p> 
    4646<input type="hidden" name="ethers" value="no"> 
    47 <input id="s1" type="checkbox" name="ethers" value="yes"$ethers_chk><label for="s1"> $(lang de:"Statische DHCP Leases aus" en:"Static DHCP leases from") <a href="/cgi-bin/file.cgi?id=exhosts">Hosts</a> (MAC &lt;-&gt; IP)</label><br> 
     47<input id="s1" type="checkbox" name="ethers" value="yes"$ethers_chk><label for="s1"> $(lang de:"Statische DHCP Leases aus" en:"Static DHCP leases from") <a href="/cgi-bin/file.cgi?id=Freetz__hosts">hosts</a> (MAC &lt;-&gt; IP)</label><br> 
    4848<span style="font-size:10px;">($(lang de:"nur Eintr&auml;ge, die eine g&uuml;ltige IP und MAC aufweisen" en:"items with valid IP and MAC addresses only"))</span> 
    4949</p> 
  • trunk/make/dropbear/files/root/etc/default.dropbear/authorized_keys.def

    r62 r3318  
    1 CAPTION='Authorized keys (Dropbear)' 
     1CAPTION='Dropbear: authorized_keys' 
    22 
    3 CONFIG_FILE='/tmp/flash/.ssh/authorized_keys' 
     3CONFIG_FILE='/tmp/flash/dropbear/authorized_keys' 
    44CONFIG_SAVE='modsave flash' 
    55CONFIG_TYPE='text' 
  • trunk/make/dropbear/files/root/etc/init.d/rc.dropbear

    r3260 r3318  
    77 
    88pre_config() { 
    9     if [ ! -e "/tmp/flash/rsa_host_key" -o ! -e "/tmp/flash/dss_host_key" ]; then 
     9    [ -d "/tmp/flash/.ssh" ] && mv /tmp/flash/.ssh /tmp/flash/dropbear 
     10    [ -d /dropbear ] || mkdir -p /tmp/flash/dropbear 
     11    [ -e /tmp/flash/rsa_host_key ] && mv /tmp/flash/rsa_host_key /tmp/flash/dropbear/rsa_host_key 
     12    [ -e /tmp/flash/dss_host_key ] && mv /tmp/flash/dss_host_key /tmp/flash/dropbear/dss_host_key 
     13 
     14    if [ ! -e "/tmp/flash/dropbear/rsa_host_key" -o ! -e "/tmp/flash/dropbear/dss_host_key" ]; then 
    1015        echo "Creating RSA and DSS host keys" 
    11         rm -f /tmp/flash/rsa_host_key 
    12         rm -f /tmp/flash/dss_host_key 
    13         dropbearkey -t rsa -f /tmp/flash/rsa_host_key 
    14         dropbearkey -t dss -f /tmp/flash/dss_host_key 
     16        rm -f /tmp/flash/dropbear/rsa_host_key 
     17        rm -f /tmp/flash/dropbear/dss_host_key 
     18        dropbearkey -t rsa -f /tmp/flash/dropbear/rsa_host_key 
     19        dropbearkey -t dss -f /tmp/flash/dropbear/dss_host_key 
    1520        /usr/bin/modsave flash 
    1621    fi 
     
    1823    if [ ! -d "/mod/etc/ssh" ]; then 
    1924        mkdir -p /mod/etc/ssh 
    20         ln -s /tmp/flash/rsa_host_key /mod/etc/ssh/rsa_host_key 
    21         ln -s /tmp/flash/dss_host_key /mod/etc/ssh/dss_host_key 
     25        ln -s /tmp/flash/dropbear/rsa_host_key /mod/etc/ssh/rsa_host_key 
     26        ln -s /tmp/flash/dropbear/dss_host_key /mod/etc/ssh/dss_host_key 
    2227    fi 
    2328     
    24     [ -d "/tmp/flash/.ssh" ] || mkdir /tmp/flash/.ssh 
    25     [ -e "/mod/root/.ssh" ] || ln -s /tmp/flash/.ssh /mod/root/.ssh 
     29    [ -e "/mod/root/.ssh" ] || ln -s /tmp/flash/dropbear /mod/root/.ssh 
    2630} 
    2731 
     
    6771 
    6872        deffile='/mod/etc/default.dropbear/authorized_keys.def' 
    69         [ -r /tmp/flash/authorized_keys.def ] && deffile='/tmp/flash/authorized_keys.def' 
    70         modreg file 'authorized_keys' 'Authorized keys' 0 "$deffile" 
     73        [ -r /tmp/flash/dropbear/authorized_keys.def ] && deffile='/tmp/flash/dropbear/authorized_keys.def' 
     74        modreg file 'dropbear__authorized_keys' 'Dropbear: keys' 0 "$deffile" 
    7175 
    7276        if [ "$DROPBEAR_ENABLED" != "yes" ]; then 
     
    8387    unload) 
    8488        stop 
    85         modunreg file 'authorized_keys' 
     89        modunreg file 'dropbear__authorized_keys' 
    8690        modunreg cgi 'dropbear' 
    8791        ;; 
  • trunk/make/dropbear/files/root/usr/lib/cgi-bin/dropbear.cgi

    r3071 r3318  
    3232cat << EOF 
    3333<ul> 
    34 <li><a href="/cgi-bin/file.cgi?id=authorized_keys">$(lang de:"Authorized keys bearbeiten" en:"Edit authorized keys")</a></li> 
     34<li><a href="/cgi-bin/file.cgi?id=dropbear__authorized_keys">$(lang de:"authorized_keys bearbeiten" en:"Edit authorized_keys")</a></li> 
    3535</ul> 
    3636EOF 
     
    5252<input id="r2" type="radio" name="rootonly" value="no"$rootonly_no_chk><label for="r2"> $(lang de:"Deaktiviert" en:"Disabled")</label> 
    5353</p> 
    54 <p style="font-size:10px;">$(lang de:"Bitte beachte, dass die FRITZ!Box kein ad&auml;quates Benutzermanagement bietet. Die Dateien /etc/passwd und /etc/shadow werden bei jedem Boot neu angelegt. Bitte aktiviere die Unterst&uuml;tzung f&uuml;r normale Benutzer nur, wenn Du genau wei&szlig;t, was Du tust." en:"Please note that the FRITZ!Box does not support normal user management. The files /etc/passwd and /etc/shadow are re-created during each boot. Please activate the support for regular users only if you know what you are doing.")</p> 
     54<p style="font-size:10px;">$(lang de:"Bitte beachte, dass die FRITZ!Box kein ad&auml;quates Benutzermanagement bietet. Die Dateien /etc/passwd und /etc/shadow m&uuml;ssen mit <b>modsave</b> gespeichert werden. Bitte aktiviere die Unterst&uuml;tzung f&uuml;r normale Benutzer nur, wenn Du genau wei&szlig;t, was Du tust." en:"Please note that the FRITZ!Box does not support normal user management. The files /etc/passwd and /etc/shadow have to be saved with <b>modsave</b>. Please activate the support for regular users only if you know what you are doing.")</p> 
    5555<h2>$(lang de:"Zus&auml;tzliche Kommandozeilen-Optionen (f&uuml;r Experten)" en:"Additional command-line options (for experts)"):</h2> 
    5656<p>$(lang de:"Optionen" en:"Options"): <input type="text" name="options" size="20" maxlength="255" value="$(html "$DROPBEAR_OPTIONS")"></p> 
  • trunk/make/knock/files/root/etc/default.knock/knockd_conf.def

    r2489 r3318  
    1 CAPTION='Knockd config' 
     1CAPTION='Knockd' 
    22 
    3 CONFIG_FILE='/tmp/flash/knockd.conf' 
     3CONFIG_FILE='/tmp/flash/knock/knockd.conf' 
    44CONFIG_SAVE='modsave flash; if [ -n "$(pidof knockd)" ]; then echo ""; /mod/etc/init.d/rc.knock restart; fi' 
    55CONFIG_TYPE='text' 
  • trunk/make/knock/files/root/etc/init.d/rc.knock

    r3307 r3318  
    66 
    77start() { 
    8     if [ ! -e "/tmp/flash/knockd.conf" ]; then 
     8    if [ ! -e "/tmp/flash/knock/knockd.conf" ]; then 
    99        echo "Creating knockd.conf" 
    10         cat /usr/share/doc/knock/knockd.conf > /tmp/flash/knockd.conf 
     10        cat /usr/share/doc/knock/knockd.conf > /tmp/flash/knock/knockd.conf 
    1111        /usr/bin/modsave flash 
    1212    fi 
     
    1818        sleep 2 
    1919    done 
    20     knockd -d -c /tmp/flash/knockd.conf -i "$KNOCK_INTERFACE" 
     20    knockd -d -c /tmp/flash/knock/knockd.conf -i "$KNOCK_INTERFACE" 
    2121    exitval=$? 
    2222    if [ "$exitval" -eq 0 ]; then 
     
    4242case "$1" in 
    4343    ""|load) 
    44         [ -d "/tmp/flash/.ssh" ] || mkdir /tmp/flash/.ssh 
     44        [ -d "/tmp/flash/knock" ] || mkdir /tmp/flash/knock 
     45        [ -r /tmp/flash/knockd.conf ] && mv /tmp/flash/knockd.conf /tmp/flash/knock/knockd.conf 
    4546 
    4647        modreg cgi 'knock' 'Knock' 
    4748 
    4849        deffile='/mod/etc/default.knock/knockd_conf.def' 
    49         [ -r "/tmp/flash/knock_conf.def" ] && deffile='/tmp/flash/knockd_conf.def' 
    50         modreg file 'knockd_conf' 'Knockd config' 0 "$deffile" 
     50        [ -r "/tmp/flash/knock/knock_conf.def" ] && deffile='/tmp/flash/knock/knockd_conf.def' 
     51        modreg file 'knockd_conf' 'Knockd: config' 0 "$deffile" 
    5152 
    5253        if [ "$KNOCK_ENABLED" != "yes" ]; then 
  • trunk/make/nfsd-cgi/files/root/etc/default.nfsd/exports.def

    r2498 r3318  
    1 CAPTION='Exports (nfsd)' 
     1CAPTION='NFSD: exports' 
    22DESCRIPTION='Syntax: &lt;path&gt; &lt;ip/subnet&gt; [&lt;mount options&gt;]<br> 
    33(z.B.: /var * (rw,anonuid=0,anongid=0,insecure,async,fsid=0,no_subtree_check)' 
  • trunk/make/nfsd-cgi/files/root/etc/default.nfsd/hosts_allow.def

    r2498 r3318  
    1 CAPTION='hosts.allow (nfsd)' 
     1CAPTION='NFSD: hosts.allow' 
    22 
    33CONFIG_FILE='/tmp/flash/nfsd/hosts.allow' 
  • trunk/make/nfsd-cgi/files/root/etc/default.nfsd/hosts_deny.def

    r2498 r3318  
    1 CAPTION='hosts.deny (nfsd)' 
     1CAPTION='NFSD: hosts.deny' 
    22 
    33CONFIG_FILE='/tmp/flash/nfsd/hosts.deny' 
  • trunk/make/nfsd-cgi/files/root/etc/init.d/rc.nfsd

    r3261 r3318  
    7575 
    7676        deffile='/mod/etc/default.nfsd/hosts_allow.def' 
    77         modreg file 'hosts_allow' 'hosts.allow' 1 "$deffile" 
     77        modreg file 'nfsd__hosts_allow' 'NFSD: hosts.allow' 1 "$deffile" 
    7878 
    7979        deffile='/mod/etc/default.nfsd/hosts_deny.def' 
    80         modreg file 'hosts_deny' 'hosts.deny' 1 "$deffile" 
     80        modreg file 'nfsd__hosts_deny' 'NFSD: hosts.deny' 1 "$deffile" 
    8181         
    8282        deffile='/mod/etc/default.nfsd/exports.def' 
    83         modreg file 'exports' 'Exports' 1 "$deffile" 
     83        modreg file 'nfsd__exports' 'NFSD: exports' 1 "$deffile" 
    8484 
    8585        if [ "$NFSD_ENABLED" != "yes" ]; then 
     
    9292    unload) 
    9393        stop 
    94         modunreg file 'exports' 
    95         modunreg file 'hosts_allow' 
    96         modunreg file 'hosts_deny' 
     94        modunreg file 'nfsd__exports' 
     95        modunreg file 'nfsd__hosts_allow' 
     96        modunreg file 'nfsd__hosts_deny' 
    9797        modunreg cgi 'nfsd' 
    9898         
  • trunk/make/nfsd-cgi/files/root/usr/lib/cgi-bin/nfsd.cgi

    r2498 r3318  
    2121cat << EOF 
    2222<ul> 
    23 <li><a href="/cgi-bin/file.cgi?id=exports"> $(lang de:"/etc/exports bearbeiten" en:"edit /etc/exports")</a></li> 
    24 <li><a href="/cgi-bin/file.cgi?id=hosts_allow"> $(lang de:"/etc/hosts.allow bearbeiten" en:"edit /etc/hosts.allow")</a></li> 
    25 <li><a href="/cgi-bin/file.cgi?id=hosts_deny"> $(lang de:"/etc/hosts.deny bearbeiten" en:"edit /etc/hosts.deny")</a></li> 
     23<li><a href="/cgi-bin/file.cgi?id=nfsd__exports"> $(lang de:"/etc/exports bearbeiten" en:"edit /etc/exports")</a></li> 
     24<li><a href="/cgi-bin/file.cgi?id=nfsd__hosts_allow"> $(lang de:"/etc/hosts.allow bearbeiten" en:"edit /etc/hosts.allow")</a></li> 
     25<li><a href="/cgi-bin/file.cgi?id=nfsd__hosts_deny"> $(lang de:"/etc/hosts.deny bearbeiten" en:"edit /etc/hosts.deny")</a></li> 
    2626 
    2727</ul> 
    2828EOF 
    2929 
    30 sec_end 
  • trunk/make/privoxy/files/root/etc/default.privoxy/action.def

    r2059 r3318  
    1 CAPTION='User Actions (Privoxy)' 
     1CAPTION='Privoxy: user.action' 
    22DESCRIPTION='$(lang de:"Lies das Privoxy Benutzerhandbuch zum Thema <a href=\'http://www.privoxy.org/user-manual/actions-file.html\' target=\'_blank\'>Actions</a> für eine detailierte Beschreibung." en:"See the Privoxy User Manual about <a href=\'http://www.privoxy.org/user-manual/actions-file.html\' target=\'_blank\'>Actions</a> for a brief description.")' 
    33 
    4 CONFIG_FILE='/tmp/flash/user.action' 
     4CONFIG_FILE='/tmp/flash/privoxy/user.action' 
    55CONFIG_SAVE='modsave flash; if [ ! -z "$(pidof privoxy)" ]; then echo ""; /mod/etc/init.d/rc.privoxy restart; fi' 
    66CONFIG_TYPE='text' 
  • trunk/make/privoxy/files/root/etc/default.privoxy/filter.def

    r2059 r3318  
    1 CAPTION='User Filter (Privoxy)' 
     1CAPTION='Privoxy: user.filter' 
    22DESCRIPTION='$(lang de:"Lies das Privoxy Benutzerhandbuch zum Thema <a href=\'http://www.privoxy.org/user-manual/filter-file.html\' target=\'_blank\'>Filter</a> für eine detailierte Beschreibung." en:"See the Privoxy User Manual about <a href=\'http://www.privoxy.org/user-manual/filter-file.html\' target=\'_blank\'>Filter</a> for a brief description.")' 
    33 
    4 CONFIG_FILE='/tmp/flash/user.filter' 
     4CONFIG_FILE='/tmp/flash/privoxy/user.filter' 
    55CONFIG_SAVE='modsave flash; if [ ! -z "$(pidof privoxy)" ]; then echo ""; /mod/etc/init.d/rc.privoxy restart; fi' 
    66CONFIG_TYPE='text' 
  • trunk/make/privoxy/files/root/etc/default.privoxy/privoxy_conf

    r2937 r3318  
    1313EOF 
    1414 
    15 [ -r "/tmp/flash/user.action" ] && echo "actionsfile /tmp/flash/user.action" 
     15[ -r "/tmp/flash/privoxy/user.action" ] && echo "actionsfile /tmp/flash/privoxy/user.action" 
    1616 
    17 [ -r "/tmp/flash/user.filter" ] && echo "filterfile /tmp/flash/user.filter" 
     17[ -r "/tmp/flash/privoxy/user.filter" ] && echo "filterfile /tmp/flash/privoxy/user.filter" 
    1818 
    1919echo "toggle $PRIVOXY_TOGGLE" 
  • trunk/make/privoxy/files/root/etc/init.d/rc.privoxy

    r3261 r3318  
    1212    [ ! -d "/mod/etc/privoxy/templates" ] && ln -s /etc/privoxy/templates /mod/etc/privoxy/templates 
    1313    ( 
    14         if [ -x "/tmp/flash/${DAEMON}_conf" ]; then 
    15             /tmp/flash/${DAEMON}_conf 
     14        if [ -x "/tmp/flash/privoxy/${DAEMON}_conf" ]; then 
     15            /tmp/flash/privoxy/${DAEMON}_conf 
    1616        else 
    1717            /mod/etc/default.$DAEMON/${DAEMON}_conf 
     
    4949case "$1" in 
    5050    ""|load) 
    51         if [ ! -r "/tmp/flash/user.filter" ]; then 
    52             cp -f /etc/privoxy/user.filter /tmp/flash/user.filter 
    53         fi 
     51        mkdir -p /tmp/flash/privoxy 
     52        [ -r /tmp/flash/user.filter ] && mv /tmp/flash/user.filter /tmp/flash/privoxy/user.filter 
     53        [ -r /tmp/flash/user.action ] && mv /tmp/flash/user.action /tmp/flash/privoxy/user.action 
    5454 
    55         if [ ! -r "/tmp/flash/user.action" ]; then 
    56             cp -f /etc/privoxy/user.action /tmp/flash/user.action 
    57         fi 
     55        [ -r "/tmp/flash/privoxy/user.filter" ] || cp -f /etc/privoxy/user.filter /tmp/flash/privoxy/user.filter 
     56        [ -r "/tmp/flash/privoxy/user.action" ] || cp -f /etc/privoxy/user.action /tmp/flash/privoxy/user.action 
    5857 
    5958        deffile='/mod/etc/default.privoxy/filter.def' 
    60         [ -r "/tmp/flash/filter.def" ] && deffile='/tmp/flash/filter.def' 
    61         modreg file 'user_filter' 'User Filter' 0 "$deffile" 
     59        [ -r "/tmp/flash/privoxy/filter.def" ] && deffile='/tmp/flash/privoxy/filter.def' 
     60        modreg file 'privoxy__user_filter' 'Privoxy: user.filter' 0 "$deffile" 
    6261 
    6362        deffile='/mod/etc/default.privoxy/action.def' 
    64         [ -r "/tmp/flash/action.def" ] && deffile='/tmp/flash/action.def' 
    65         modreg file 'user_action' 'User Actions' 0 "$deffile" 
     63        [ -r "/tmp/flash/privoxy/action.def" ] && deffile='/tmp/flash/privoxy/action.def' 
     64        modreg file 'privoxy__user_action' 'Privoxy: user.actions' 0 "$deffile" 
    6665 
    6766        modreg cgi 'privoxy' 'Privoxy' 
     
    8180        stop 
    8281 
    83         modunreg file 'user_filter' 
    84         modunreg file 'user_action' 
     82        modunreg file 'privoxy__user_filter' 
     83        modunreg file 'privoxy__user_action' 
    8584        modunreg cgi 'privoxy' 
    8685        ;; 
  • trunk/make/privoxy/files/root/usr/lib/cgi-bin/privoxy.cgi

    r2938 r3318  
    3535<p><input id="e3" type="radio" name="toggle" value="1"$toggle_chk><label for="e3"> $(lang de:"Ja" en:"Yes")</label> <input id="e4" type="radio" name="toggle" value="0"$neutral_chk><label for="e4"> $(lang de:"Nein" en:"No")</label><br /> 
    3636<ul> 
    37 <li><a href="/cgi-bin/file.cgi?id=user_filter">$(lang de:"Eigene Filter bearbeiten" en:"Edit custom filter")</a></li> 
    38 <li><a href="/cgi-bin/file.cgi?id=user_action">$(lang de:"Eigene Aktionen bearbeiten" en:"Edit custom actions")</a></li> 
     37<li><a href="/cgi-bin/file.cgi?id=privoxy__user_filter">$(lang de:"Eigene Filter bearbeiten" en:"Edit custom filter")</a></li> 
     38<li><a href="/cgi-bin/file.cgi?id=privoxy__user_action">$(lang de:"Eigene Aktionen bearbeiten" en:"Edit custom actions")</a></li> 
    3939</ul> 
    4040<p>$(lang de:"Weitere Optionen:" en:"More options:")<br> 
  • trunk/make/wol-cgi/files/root/usr/lib/cgi-bin/wol.cgi

    r2296 r3318  
    3232cat << EOF 
    3333<ul> 
    34 <li><a href="/cgi-bin/file.cgi?id=exhosts">$(lang de:"Hosts bearbeiten" en:"Edit hosts")</a></li> 
     34<li><a href="/cgi-bin/file.cgi?id=Freetz__hosts">$(lang de:"Hosts bearbeiten" en:"Edit hosts")</a></li> 
    3535</ul> 
    3636<p style="font-size:10px;">($(lang de:"alle Eintr&auml;ge, die eine g&uuml;ltige MAC Adresse aufweisen" en:"all items with a valid MAC address"))</p> 
  • trunk/root/etc/default.mod/crontab.def

    r1 r3318  
    1 CAPTION='Crontab' 
     1CAPTION='Freetz: crontab' 
     2DESCRIPTION='Syntax: $(lang de:"Minute Stunde Tag Monat Wochentag Befehl" en:"minute hour day month day-of-week command")' 
    23 
    3 CONFIG_FILE='/tmp/flash/crontab.save' 
    4 CONFIG_SAVE='cp /tmp/flash/crontab.save /var/spool/cron/crontabs/root; modsave flash; if [ -n "$(pidof crond)" ]; then echo ""; /mod/etc/init.d/rc.crond restart; fi' 
     4CONFIG_FILE='/tmp/flash/mod/crontab' 
     5CONFIG_SAVE='cp /tmp/flash/mod/crontab /var/spool/cron/crontabs/root; modsave flash; if [ -n "$(pidof crond)" ]; then echo ""; /mod/etc/init.d/rc.crond restart; fi' 
    56CONFIG_TYPE='text' 
  • trunk/root/etc/default.mod/modules.def

    r1827 r3318  
    1 CAPTION='modules' 
     1CAPTION='Freetz: modules' 
    22DESCRIPTION='$(lang de:"Hier können Module eingetragen werden, die während dem Bootprozess geladen werden sollen (z.B. pl2303)." en:"Here you can enter modules to be loaded during boot process (e.g. pl2303).")' 
    33 
    4 CONFIG_FILE='/tmp/flash/modules' 
     4CONFIG_FILE='/tmp/flash/mod/modules' 
    55CONFIG_SAVE='modsave flash;' 
    66CONFIG_TYPE='text' 
  • trunk/root/etc/default.mod/rc_custom.def

    r1791 r3318  
    1 CAPTION='rc.custom' 
    2 DESCRIPTION='rc.custom $(lang de:"Skript wird am Ende des Bootprozesses aufgerufen" en:"script is executed at the end of the boot process")' 
     1CAPTION='Freetz: rc.custom' 
     2DESCRIPTION='$(lang de:"Skript wird am Ende des Bootprozesses aufgerufen" en:"script is executed at the end of the boot process")' 
    33 
    4 CONFIG_FILE='/tmp/flash/rc.custom' 
     4CONFIG_FILE='/tmp/flash/mod/rc.custom' 
    55CONFIG_SAVE='modsave flash;' 
    6 CONFIG_TYPE='text' 
  • trunk/root/etc/init.d/rc.crond

    r3164 r3318  
    1717 
    1818start() { 
    19     if [ -r /tmp/flash/crontab.save ]; then 
    20         cp /tmp/flash/crontab.save /var/spool/cron/crontabs/root 
     19    if [ -r /tmp/flash/mod/crontab ]; then 
     20        cp /tmp/flash/mod/crontab /var/spool/cron/crontabs/root 
    2121    else 
    2222        touch /var/spool/cron/crontabs/root 
     
    5151case "$1" in 
    5252        ""|load) 
     53        [ -r /tmp/flash/crontab.save ] && mv /tmp/flash/crontab.save /tmp/flash/mod/crontab 
    5354        deffile='/etc/default.mod/crontab.def' 
    54         [ -r "/tmp/flash/crontab.def" ] && deffile='/tmp/flash/crontab.def' 
    55         modreg file 'crontab' 'Crontab' 0 "$deffile" 
     55        [ -r "/tmp/flash/mod/crontab.def" ] && deffile='/tmp/flash/mod/crontab.def' 
     56        modreg file 'Freetz__crontab' 'Freetz: crontab' 0 "$deffile" 
    5657 
    5758        if [ "$MOD_CROND" != "yes" ]; then 
     
    6465    unload) 
    6566        stop 
    66         modunreg file 'crontab' 
     67        modunreg file 'Freetz__crontab' 
    6768        ;; 
    6869    start) 
  • trunk/root/etc/init.d/rc.mod

    r3159 r3318  
    1616 
    1717    [ -d /tmp/flash ] || /usr/bin/modload 
     18 
     19    [ -r /tmp/flash/mod/resolv.conf ] || cat /var/tmp/resolv.conf>/tmp/flash/mod/resolv.conf 
    1820 
    1921    /etc/init.d/rc.crond 
     
    4042    fi 
    4143 
    42     [ -r /tmp/flash/rc.custom ] && . /tmp/flash/rc.custom 
     44    [ -r /tmp/flash/rc.custom ] && mv /tmp/flash/rc.custom /tmp/flash/mod/rc.custom 
     45    [ -r /tmp/flash/mod/rc.custom ] && . /tmp/flash/mod/rc.custom 
    4346 
    4447    /etc/init.d/rc.swap 
     
    4750case "$1" in 
    4851    "") 
    49         deffile='/etc/default.mod/exhosts.def' 
    50         [ -r /tmp/flash/exhosts.def ] && deffile='/tmp/flash/exhosts.def' 
    51         modreg file 'exhosts' 'Hosts' 1 "$deffile" 
     52 
     53        deffile='/etc/default.mod/_profile.def' 
     54        [ -r /tmp/flash/mod/_profile.def ] && deffile='/tmp/flash/mod/_profile.def' 
     55        modreg file 'Freetz___profile' 'Freetz: .profile' 0 "$deffile" 
     56 
     57        deffile='/etc/default.mod/hosts.def' 
     58        [ -r /tmp/flash/mod/hosts.def ] && deffile='/tmp/flash/mod/hosts.def' 
     59        modreg file 'Freetz__hosts' 'Freetz: hosts' 1 "$deffile" 
     60 
     61        deffile='/etc/default.mod/modules.def' 
     62        [ -r /tmp/flash/mod/modules.def ] && deffile='/tmp/flash/mod/modules.def' 
     63        modreg file 'Freetz__modules' 'Freetz: modules' 0 "$deffile" 
     64 
     65        deffile='/etc/default.mod/resolv_conf.def' 
     66        [ -r /tmp/flash/mod/resolv_conf.def ] && deffile='/tmp/flash/mod/resolv_conf.def' 
     67        modreg file 'Freetz__resolv_conf' 'Freetz: resolv.conf' 0 "$deffile" 
    5268 
    5369        deffile='/etc/default.mod/rc_custom.def' 
    54         [ -r /tmp/flash/rc_custom.def ] && deffile='/tmp/flash/rc_custom.def' 
    55         modreg file 'rc_custom' 'rc.custom' 0 "$deffile" 
    56  
    57         deffile='/etc/default.mod/modules.def' 
    58         [ -r /tmp/flash/modules.def ] && deffile='/tmp/flash/modules.def' 
    59         modreg file 'modules' 'modules' 0 "$deffile" 
     70        [ -r /tmp/flash/mod/rc_custom.def ] && deffile='/tmp/flash/mod/rc_custom.def' 
     71        modreg file 'Freetz__rc_custom' 'Freetz: rc.custom' 0 "$deffile" 
    6072 
    6173        [ -r "/mod/etc/conf/mod.cfg" ] && . /mod/etc/conf/mod.cfg 
  • trunk/root/usr/bin/modhosts

    r2944 r3318  
    2828case "$1" in 
    2929    "") 
    30         mvi /tmp/flash/exhosts 
     30        mvi /tmp/flash/mod/hosts 
    3131        $0 load 
    3232        ;; 
     
    5353        fi 
    5454 
    55         if [ -r /tmp/flash/exhosts ]; then 
    56             egrep -v '^(#|[[:space:]]*$)' /tmp/flash/exhosts | 
     55        [ -r /tmp/flash/exhosts ] && mv /tmp/flash/exhosts /tmp/flash/mod/hosts 
     56        if [ -r /tmp/flash/mod/hosts ]; then 
     57            egrep -v '^(#|[[:space:]]*$)' /tmp/flash/mod/hosts | 
    5758                while read -r ip mac interface host desc; do 
    5859                    if [ -z "$host" -o "$host" = "*" ]; then 
  • trunk/root/usr/bin/modload

    r2054 r3318  
    2828    echo 'done.' 
    2929fi 
     30[ -d /tmp/flash/mod ] || mkdir -p /tmp/flash/mod 
    3031 
    3132[ -e /mod/etc/default.mod ] || ln -s /etc/default.mod /mod/etc/default.mod 
     
    5960 
    6061echo -n 'Loading modules...' 
    61 if [ -r "/tmp/flash/modules" ]; then 
    62     grep -v "^#" /tmp/flash/modules | while read -r module; do 
     62[ -r /tmp/flash/modules ] && mv /tmp/flash/modules /tmp/flash/mod/modules 
     63if [ -r /tmp/flash/mod/modules ]; then 
     64    grep -v "^#" /tmp/flash/mod/modules | while read -r module; do 
    6365        [ -z "$module" ] || modprobe $module 
    6466    done 
  • trunk/root/usr/lib/libmodcgi.sh

    r2954 r3318  
    22 
    33sec_level=1 
    4 [ -r "/tmp/flash/security" ] && let sec_level="$(cat /tmp/flash/security)" 
     4[ -r /tmp/flash/security ] && mv /tmp/flash/security /tmp/flash/mod/security 
     5[ -r /tmp/flash/mod/security ] && let sec_level="$(cat /tmp/flash/mod/security)" 
    56 
    67# HTML-escape pieces of texts, large ones in a streaming manner 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.