Changeset 406


Ignore:
Timestamp:
12/03/08 23:07:49 (3 years ago)
Author:
tschmitt
Message:
  • paedml40-upgrade: diverse Anpassungen bzgl. paedML Linux 4.0.2
  • postinst:
    • db.conf Update für Schulkonsole nochmal modifiziert
    • php5-Konfiguration wird angepasst (s.u.)
    • /etc/mindi/mindi.conf wird kopiert, falls nicht vorhanden (s.u.)
  • linuxmuster-setup:
Location:
main/linuxmuster-base/trunk
Files:
6 added
5 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • main/linuxmuster-base/trunk/debian/changelog

    r404 r406  
    11linuxmuster-base (1.4.44-1) testing; urgency=low 
    22 
    3   * paedml40-upgrade: minor fixes according to paedML Linux 4.0.2 
    4   * postinst: minor improvements for schulkonsole's db.conf update 
    5  
    6  -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 29 Nov 2008 19:44:50 +0100 
     3  * paedml40-upgrade: several modifications according to paedML Linux 4.0.2 
     4  * postinst: 
     5    - minor improvements for schulkonsole's db.conf update 
     6    - modified php5 configuration (see below) 
     7    - adding default mindi.conf (see below) 
     8  * linuxmuster-setup: 
     9    - removed obsolete postgres configuration files 
     10    - modified sophomorix configuration according to version 2.0.3-2 
     11    - added a default mindi.conf 
     12    - added php5 conf.d files (https://bugs.launchpad.net/ubuntu/+source/php5/+bug/63141) 
     13 
     14 -- Thomas Schmitt <schmitt@lmz-bw.de>  Wed, 03 Dec 2008 10:28:01 +0100 
    715 
    816linuxmuster-base (1.4.43-1) testing; urgency=low 

  • main/linuxmuster-base/trunk/debian/postinst

    r404 r406  
    616616        fi 
    617617 
     618        # https://bugs.launchpad.net/ubuntu/+source/php5/+bug/63141, 1.4.44-1) 
     619        if grep -q ^"extension=curl.so" /etc/php5/conf.d/curl.ini; then 
     620                backup_file /etc/php5/conf.d/curl.ini 
     621                echo "Fixing /etc/php5/conf.d/curl.ini ..." 
     622                sed -e 's|^extension=curl.so|#extension=curl.so|' -i /etc/php5/conf.d/curl.ini 
     623                echo "# tschmitt: moved to pgsql.ini -> https://bugs.launchpad.net/ubuntu/+source/php5/+bug/63141" >> /etc/php5/conf.d/curl.ini 
     624        fi 
     625        if ! grep -q ^"extension=curl.so" /etc/php5/conf.d/pgsql.ini; then 
     626                backup_file /etc/php5/conf.d/pgsql.ini 
     627                echo "Fixing /etc/php5/conf.d/pgsql.ini ..." 
     628                echo "# tschmitt: moved from curl.ini -> https://bugs.launchpad.net/ubuntu/+source/php5/+bug/63141" >> /etc/php5/conf.d/pgsql.ini 
     629                echo "extension=curl.so" >> /etc/php5/conf.d/pgsql.ini 
     630        fi 
     631 
     632        # provide a default mindi.conf (1.4.44-1) 
     633        if [ ! -e /etc/mindi/mindi.conf ]; then 
     634                echo "Providing a default mindi.conf ..." 
     635                cp $STATICTPLDIR/etc/mindi/mindi.conf /etc/mindi 
     636        fi 
     637 
    618638        # updating release information 
    619639        echo "$(getdistname) $DISTFULLVERSION / Codename $CODENAME" > /etc/issue 

  • main/linuxmuster-base/trunk/share/tasks/server

    r153 r406  
    5858php-mail-mime 
    5959php-cache 
    60 php-crypt-chap 
    6160php-file 
    6261php-net-ftp 

  • main/linuxmuster-base/trunk/share/tasks/upgrade40

    r404 r406  
    295295libradius1 
    296296libreadline5 
     297librecode0 
    297298libruby1.8 
    298299libsasl2 
    … …  
    398399mimetex 
    399400mindi 
     401mindi-busybox 
    400402mkisofs 
    401403mktemp 
    … …  
    524526razor 
    525527readline-common 
     528recode 
    526529rsync 
    527530ruby1.8 

  • main/linuxmuster-base/trunk/share/upgrade/paedml40-upgrade.sh

    r404 r406  
    224224        if [ ! -e /var/cache/linuxmuster/.paedml40-upgrade ]; then 
    225225                touch /var/cache/linuxmuster/.paedml40-upgrade 
    226                 apt-get clean 
     226                #apt-get clean 
    227227        fi 
    228228        echo "Lade Software-Pakete herunter ..." 
    … …  
    388388echo -e "Ja\nJa\n" | aptitude -y install slapd postgresql 
    389389reinstall "slapd postgresql" 
     390ps -e | grep -q slapd || /etc/init.d/slapd start 
     391ps -e | grep -q postmaster || /etc/init.d/postgresql-8.1 restart 
    390392echo 
    391393 
    … …  
    761763if [ -e /etc/kde/kdm/kdmrc ]; then 
    762764        greetstr="`cat /etc/issue` auf %n" 
    763         sed -e "s|^GreetString=.*|GreetString=$greetstr|g" -i /etc/kde/kdm/kdmrc  
    764 fi 
    765  
    766 # finally do a reconfigure 
    767 /etc/init.d/slapd start 
     765        sed -e "s|^GreetString=.*|GreetString=$greetstr|" -i /etc/kde/kdm/kdmrc  
     766fi 
     767 
     768# finally start necessary services and do a reconfigure to fix things which are not yet fixed 
     769ps -e | grep -q slapd || /etc/init.d/slapd start 
     770ps -e | grep -q smbd || /etc/init.d/samba start 
     771ps ax | grep postgresql/8.1 | grep -qv grep || /etc/init.d/postgresql-8.1 start 
    768772dpkg-reconfigure linuxmuster-base 
    769773echo 

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

    r156 r406  
    66          ssh samba slapd postgresql-8.1 postgresql-7.4 nscd linuxmuster-ipcop uml-utilities \ 
    77          portmap openbsd-inetd bind9 dhcp3-server avahi-daemon webmin" 
     8 
     9# make sure they are enabled to be able to shut them down 
     10[ -e /etc/default/atftpd ] && sed -e 's/^USE_INETD=.*/USE_INETD=false/' -i /etc/default/atftpd 
     11[ -e /etc/default/rsync ] && sed -e 's/^RSYNC_ENABLE=.*/RSYNC_ENABLE=true/' -i /etc/default/rsync 
     12[ -e /etc/default/rembo ] && sed -e 's/^START_REMBO=.*/START_REMBO=yes/' -i /etc/default/rembo 
    813 
    914for service in $services; do 

  • main/linuxmuster-base/trunk/var/config-dynamic/15_ldap/prepatch

    r156 r406  
    1 # start postgresql 
    2 /etc/init.d/postgresql-8.1 start 
     1# recreate pg clusters on first install 
     2if [ "$1" = "--first" ]; then 
     3    for i in 7.4 8.1; do 
     4        pg_dropcluster $i main 
     5        pg_createcluster $i main 
     6        cp -f $STATICTPLDIR/etc/postgresql/$i/main/* /etc/postgresql/$i/main 
     7        /etc/init.d/postgresql-$i start 
     8    done 
     9else 
     10    /etc/init.d/postgresql-8.1 start 
     11fi 
    312 
    413 
    … …  
    105114        addgroup openldap ssl-cert 
    106115 
    107         # create new database 
    108         sophomorix-setup-pgldap --new-database 
     116        # create new ldap database 
     117        new_soph_version=`dpkg -l sophomorix-pgldap | grep 'sophomorix-pg' | { read status name version desc; echo "$version";}` 
     118        old_soph_version="0.0.0-0" 
     119        sophomorix-setup-pgldap --oldversion "$old_soph_version" --newversion "$new_soph_version" --new-database 
    109120 
    110         # random password for ldap db user 
     121        # new random password for ldap db user 
    111122        ldapdbpw=`pwgen -s 8 1` 
     123 
     124        # set ldap db password for schulkonsole 
    112125        psql -U postgres -d template1 -qc "ALTER USER ldap WITH PASSWORD '"$ldapdbpw"';" 
    113         sed -e "s/^Password=.*/Password=$ldapdbpw/" -i /etc/linuxmuster/schulkonsole/db.conf 
     126        sed -e "s|^Password=.*|Password=$ldapdbpw|" -i /etc/linuxmuster/schulkonsole/db.conf 
     127 
     128        # deactivate postgres 7.4 
     129        /etc/init.d/postgresql-7.4 stop 
     130        update-rc.d -f postgresql-7.4 remove 
    114131 
    115132else 
    116133 
    117134        # update user database with basedn and workgroup if necessary 
    118         [ "$update_ldap" = "yes" ] && sophomorix-setup-pgldap 
     135        if [ "$update_ldap" = "yes" ]; then 
     136                ldapdbpw=`grep ^Password /etc/linuxmuster/schulkonsole/db.conf | awk -F\= '{ print $2 }'` 
     137                sophomorix-setup-pgldap --slapd-standalone --dbpw "$ldapdbpw" --keep-database 
     138        fi 
    119139 
    120140fi 

  • main/linuxmuster-base/trunk/var/config-dynamic/40_linbo/prepatch

    r156 r406  
    8585        done 
    8686 
    87         # patch pxe confs with serverip 
    88         for i in $PXEGRUBCFG $PXELINUXCFG `find $LINBODIR/ -type f -name 'pxegrub.lst.*'`; do 
    89                 backup_file $i 
    90                 sed -e "s/server=\([0-9]\{1,3\}[.]\)\{3\}[0-9]\{1,3\}/server=$serverip/g" -i $i 
    91         done 
     87        # patch pxe confs with serverip (obsolete) 
     88        #for i in $PXEGRUBCFG $PXELINUXCFG `find $LINBODIR/ -type f -name 'pxegrub.lst.*'`; do 
     89        #       backup_file $i 
     90        #       sed -e "s/server=\([0-9]\{1,3\}[.]\)\{3\}[0-9]\{1,3\}/server=$serverip/g" -i $i 
     91        #done 
    9292 
    9393        # patch regs with workgroup 
Note: See TracChangeset for help on using the changeset viewer.