Changeset 1208


Ignore:
Timestamp:
01/14/12 19:35:54 (4 months ago)
Author:
tschmitt
Message:
  • linuxmuster-setup: IPCop-Konfiguration deaktiviert.
Location:
main/linuxmuster-base/branches/testing
Files:
6 added
5 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • main/linuxmuster-base/branches/testing/debian/changelog

    r1207 r1208  
    33  * initial modifications to be installable on Ubuntu 11.10. 
    44  * removed rembo/myshn scripts and config templates. 
    5  
    6  -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 14 Jan 2012 19:14:01 +0100 
     5  * deactivated various ipcop stuff. 
     6 
     7 -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 14 Jan 2012 19:34:20 +0100 
    78 
    89linuxmuster-base (5.1.0-3lenny0) lenny; urgency=low 

  • main/linuxmuster-base/branches/testing/var/config-dynamic/00_stop-services/prepatch

    r1206 r1208  
    66          linbo-multicast nagios3 atd cron rembo quota apache2 cups \ 
    77          clamav-freshclam clamav-daemon cyrus2.2 postfix saslauthd amavis \ 
    8           mysql openntpd ssh samba slapd postgresql-8.3 postgresql-8.1 \ 
    9           postgresql-7.4 nscd linuxmuster-ipcop uml-utilities portmap \ 
    10           openbsd-inetd bind9 dhcp3-server avahi-daemon webmin" 
     8          mysql openntpd ssh samba slapd postgresql-8.4 nscd portmap \ 
     9          openbsd-inetd bind9 dhcp3-server" 
    1110 
    1211# make sure they are enabled to be able to shut them down 
    1312[ -e /etc/default/tftpd-hpa ] && sed -e 's/^RUN_DAEMON=.*/RUN_DAEMON=yes/' -i /etc/default/tftpd-hpa 
    1413[ -e /etc/default/rsync ] && sed -e 's/^RSYNC_ENABLE=.*/RSYNC_ENABLE=true/' -i /etc/default/rsync 
    15 [ -e /etc/default/rembo ] && sed -e 's/^START_REMBO=.*/START_REMBO=yes/' -i /etc/default/rembo 
    1614 
    1715for service in $services; do 

  • main/linuxmuster-base/branches/testing/var/config-dynamic/99_start-services/postpatch

    r1206 r1208  
    2626 
    2727                # test ssh connection to intregated ipcop 
    28                 if [[ -z "$ipcoptest" && ! -e /root/.ssh/known_hosts ]]; then 
    29                         echo "Testing ssh connection to IPCop ..." 
    30                         $SCRIPTSDIR/ipcop-test-ssh.exp $ipcopip 
    31                 fi 
     28                #if [[ -z "$ipcoptest" && ! -e /root/.ssh/known_hosts ]]; then 
     29                #       echo "Testing ssh connection to IPCop ..." 
     30                #       $SCRIPTSDIR/ipcop-test-ssh.exp $ipcopip 
     31                #fi 
    3232 
    3333                # restart ipcop's proxy 
    34                 echo "Restarting ipcop's squid ..." 
    35                 exec_ipcop /usr/bin/find "/var/ipcop/urlfilter -name \*.db -exec chmod 666 '{}' \;" 
    36                 exec_ipcop /usr/local/bin/restartsquid 
     34                #echo "Restarting ipcop's squid ..." 
     35                #exec_ipcop /usr/bin/find "/var/ipfire/urlfilter -name \*.db -exec chmod 666 '{}' \;" 
     36                #exec_ipcop /usr/local/bin/restartsquid 
    3737 
    3838                success=yes 
    … …  
    6060services="openbsd-inetd atd cron openntpd linuxmuster-base" 
    6161for service in $services; do 
    62         /etc/init.d/$service start 
     62 [ -e "$service" ] && /etc/init.d/$service start 
    6363done 
    6464 
    … …  
    6666touch $INSTALLED 
    6767 
    68 # reconfigure linuxmuster-base to fix what has been not yet fixed 
    69 dpkg-reconfigure linuxmuster-base 
     68# reconfigure linuxmuster-base to fix what has been not yet fixed, deprecated? 
     69#dpkg-reconfigure linuxmuster-base 
    7070 
    71 # repair linbo stuff, if necessary 
    72 [ "$imaging" = "linbo" ] && dpkg-reconfigure linuxmuster-linbo 
     71# repair linbo stuff, if necessary, deprecated? 
     72#[ "$imaging" = "linbo" ] && dpkg-reconfigure linuxmuster-linbo 
    7373 
    7474# apply workstation data if internal net has changed 
    … …  
    9292fi 
    9393 
    94 # apply workstation data if imaging has changed 
    95 if [[ "$1" = "--modify" && -z "$wsimport" && "$imaging" != "$imaging_old" && -s "$WIMPORTDATA" ]]; then 
    96         import_workstations 
    97 fi 
     94# apply workstation data if imaging has changed, deprecated 
     95#if [[ "$1" = "--modify" && -z "$wsimport" && "$imaging" != "$imaging_old" && -s "$WIMPORTDATA" ]]; then 
     96#       import_workstations 
     97#fi 
    9898 
    99 # remove obsolete cron jobs 
    100 for i in kronolith2 php4 uucp; do 
    101         [ -e "/etc/cron.d/$i" ] && rm /etc/cron.d/$i 
    102 done 
     99# remove obsolete cron jobs, deprecated? 
     100#for i in kronolith2 php4 uucp; do 
     101#       [ -e "/etc/cron.d/$i" ] && rm /etc/cron.d/$i 
     102#done 
    103103 
Note: See TracChangeset for help on using the changeset viewer.