Changeset 409


Ignore:
Timestamp:
12/07/08 13:51:14 (3 years ago)
Author:
tschmitt
Message:
  • linuxmuster-setup:
    • obsoletes Konfigurationstemplate für sophomorix' slapd.conf entfernt.
    • obsoletes repair-admins-Skript entfernt.
    • div. Anpassungen bzgl. Neuerstellung der ldap-DB mit sophomorix bei Erstinstallation.
  • paedml40-upgrade:
    • div. Fixes bzgl. slapd- und rembo/linbo-Konfiguration.
Location:
main/linuxmuster-base/trunk
Files:
1 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

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

    r406 r409  
    11linuxmuster-base (1.4.44-1) testing; urgency=low 
    22 
    3   * paedml40-upgrade: several modifications according to paedML Linux 4.0.2 
     3  * paedml40-upgrade: 
     4    - some improvements according to paedML Linux 4.0.2 
     5    - removed slapd.conf tls patch according to sophomorix 2.0.3 
    46  * postinst: 
    57    - minor improvements for schulkonsole's db.conf update 
    68    - modified php5 configuration (see below) 
    7     - adding default mindi.conf (see below) 
     9    - providing default mindi.conf if not present (see below) 
     10    - modified slapd.conf tls patching according to sophomorix 2.0.3 
    811  * linuxmuster-setup: 
    912    - removed obsolete postgres configuration files 
     13    - removed slapd.conf template 
    1014    - modified sophomorix configuration according to version 2.0.3-2 
    1115    - added a default mindi.conf 
    1216    - 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 
     17  * removed deprecated repair-admins.sh 
     18 
     19 -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 06 Dec 2008 12:19:24 +0100 
    1520 
    1621linuxmuster-base (1.4.43-1) testing; urgency=low 

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

    r406 r409  
    565565        # adding tls support to slapd.conf 
    566566        slapdtpl=/usr/share/sophomorix/config-templates/ldap/slapd-standalone.conf.template 
    567         if ! grep -q ^TLS $slapdtpl || ! grep -q misc.schema $slapdtpl; then 
    568                 cp $slapdtpl $slapdtpl.dpkg-old 
    569                 cp $STATICTPLDIR$slapdtpl $slapdtpl 
    570         fi 
    571567        [ -e /etc/ldap/slapd.conf.custom ] || cp $STATICTPLDIR/etc/ldap/slapd.conf.custom /etc/ldap 
    572568        if ! grep -q ^TLS /etc/ldap/slapd.conf || ! grep -q misc.schema /etc/ldap/slapd.conf; then 
    … …  
    578574                        s/@@message3@@/${message3}/ 
    579575                        s/@@basedn@@/${basedn}/g 
     576                        s/@@tls_comment@@//g 
    580577                        s/@@ldappassword@@/${rootpw}/g" $slapdtpl > /etc/ldap/slapd.conf 
    581578                addgroup openldap ssl-cert 
     579                chmod 600 /etc/ldap/slapd.conf* 
    582580                slapd_reload=yes 
    583581        fi 

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

    r406 r409  
    378378linuxmuster-nagios-base 
    379379linuxmuster-schulkonsole 
    380 linuxmuster-schulkonsole-templates-base 
    381380linuxmuster-schulkonsole-wrapper 
    382381locales 

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

    r406 r409  
    384384 
    385385 
    386 # update slapd and old postgresql before server task is reinstalled 
    387 echo "Installiere OpenLDAP ..." 
    388 echo -e "Ja\nJa\n" | aptitude -y install slapd postgresql 
    389 reinstall "slapd postgresql" 
    390 ps -e | grep -q slapd || /etc/init.d/slapd start 
    391 ps -e | grep -q postmaster || /etc/init.d/postgresql-8.1 restart 
     386# update slapd, postgresql etc. before server task is reinstalled 
     387echo "Installiere OpenLDAP, Postgresql, Cyrus, Postfix ..." 
     388echo -e "Ja\nJa\n" | aptitude -y install slapd postgresql cyrus-common-2.2 postfix 
     389reinstall "slapd postgresql cyrus-common-2.2 postfix" 
     390echo 
     391 
     392 
     393# add cyrus and postfix user to group ssl-cert 
     394echo "Aktualisiere Systembenutzer ..." 
     395for i in cyrus postfix openldap; do 
     396        addgroup $i ssl-cert 
     397done 
     398chown root:ssl-cert /etc/ssl/private -R 
    392399echo 
    393400 
    … …  
    452459reinstall "$imagingtask" 
    453460echo 
     461 
     462 
     463# install nonfree or free components 
     464basetpl=linuxmuster-schulkonsole-templates-base 
     465paedmltpl=linuxmuster-schulkonsole-templates-paedml 
     466if [ -n "$(aptitude search $paedmltpl)" ]; then 
     467        # check if base-template is installed and remove it 
     468        if dpkg -L $basetpl &> /dev/null; then 
     469                echo "Deinstalliere $basetpl ..." 
     470                dpkg -r --force-all $basetpl &> /dev/null 
     471        fi 
     472        echo "Installiere $paedmltpl ..." 
     473        echo -e "Ja\nJa\n" | aptitude -y install $paedmltpl 
     474        reinstall $paedmltpl 
     475        checkpackages=$paedmltpl 
     476else 
     477        echo -e "Ja\nJa\n" | aptitude -y install $basetpl 
     478        reinstall $basetpl 
     479        checkpackages=$basetpl 
     480fi 
     481indexpage=linuxmuster-indexpage 
     482if [ -n "$(aptitude search $indexpage)" ]; then 
     483        echo "Installiere $indexpage ..." 
     484        echo -e "Ja\nJa\n" | aptitude -y install $indexpage 
     485        reinstall $indexpage 
     486        checkpackages="$checkpackages $indexpage" 
     487fi 
    454488 
    455489 
    … …  
    482516        reinstall "$desktoptask" 
    483517        echo 
    484         checkpackages="$commontask $servertask $imagingtask $desktoptask" 
    485 else 
    486         checkpackages="$commontask $servertask $imagingtask" 
     518        checkpackages="$commontask $servertask $checkpackages $imagingtask $desktoptask" 
     519else 
     520        checkpackages="$commontask $servertask $checkpackages $imagingtask" 
    487521fi 
    488522 
    … …  
    515549done 
    516550echo 
    517  
    518  
    519 # check for nonfree components 
    520 basetplname=linuxmuster-schulkonsole-templates-base 
    521 paedmltpldeb="$(ls -1r /var/cache/apt/archives/linuxmuster-schulkonsole-templates-paedml_*_all.deb 2> /dev/null)" 
    522 if [ -n "$paedmltpldeb" ]; then 
    523         # check if base-template is installed and remove it 
    524         if ! dpkg -s $basetplname | grep ^Status | grep -q not-installed; then 
    525                 echo "Deinstalliere $basetplname ..." 
    526                 dpkg -r --force-all $basetplname &> /dev/null 
    527         fi 
    528         echo "Installiere $paedmltpldeb ..." 
    529         dpkg -i $paedmltpldeb 
    530 fi 
    531 indexpagedeb="$(ls -1r /var/cache/apt/archives/linuxmuster-indexpage_4.0-*_all.deb 2> /dev/null)" 
    532 if [ -n "$indexpagedeb" ]; then 
    533         echo "Installiere $indexpagedeb ..." 
    534         dpkg -i $indexpagedeb 
    535 fi 
    536551 
    537552 
    … …  
    628643fi 
    629644 
     645 
     646# fix running atftpd if imaging=rembo 
     647if [ "$imaging" = "rembo" -a -e /etc/default/atftpd ]; then 
     648        echo "Deactivating atftpd because imaging is rembo ..." 
     649        sed -e 's|^USE_INETD=.*|USE_INETD=true|' -i /etc/default/atftpd 
     650fi 
     651 
     652 
    630653# deny client-updates 
    631654if grep -q ^"ignore client-updates" /etc/dhcp3/dhcpd.conf; then 
    … …  
    635658fi 
    636659 
    637 # add cyrus and postfix user to group ssl-cert 
    638 echo "Aktualisiere Systembenutzer ..." 
    639 for i in cyrus postfix openldap; do 
    640         addgroup $i ssl-cert 
    641 done 
    642 chown root:ssl-cert /etc/ssl/private -R 
    643 echo 
    644  
    645660# clean up old cron jobs 
    646661echo "Entferne alte cron jobs ..." 
    … …  
    683698#rm -rf /etc/nagios2 
    684699tar xzf $nagiosbackup -C / 
     700# move probably obsolete config files out of the way 
     701mkdir -p /etc/nagios2/conf.d_backup 
     702for i in /etc/nagios2/conf.d/*.cfg; do 
     703        echo $i | grep -q linuxmuster || mv $i /etc/nagios2/conf.d_backup 
     704done 
    685705[ -e /etc/nagios2/resource.cfg ] || echo "# dummy config file created by paedML's etch-upgrade script" > /etc/nagios2/resource.cfg 
    686706backup_file /etc/nagios2/apache2.conf 
    … …  
    714734 
    715735 
    716 # adding tls support to slapd.conf 
    717 slapdtpl=/usr/share/sophomorix/config-templates/ldap/slapd-standalone.conf.template 
    718 if ! grep -q ^TLS $slapdtpl || ! grep -q misc.schema $slapdtpl; then 
    719         cp $slapdtpl $slapdtpl.dpkg-old 
    720         cp $STATICTPLDIR$slapdtpl $slapdtpl 
    721 fi 
    722 [ -e /etc/ldap/slapd.conf.custom ] || cp $STATICTPLDIR/etc/ldap/slapd.conf.custom /etc/ldap 
    723 if ! grep -q ^TLS /etc/ldap/slapd.conf || ! grep -q misc.schema $slapdtpl; then 
    724         echo "Aktualisiere LDAP-Konfiguration ..." 
    725         backup_file /etc/ldap/slapd.conf 
    726         backup_file /etc/default/slapd 
    727         rootpw=`grep ^rootpw /etc/ldap/slapd.conf | awk '{ print $2 }'` 
    728         sed -e "s/@@message1@@/${message1}/ 
    729                 s/@@message2@@/${message2}/ 
    730                 s/@@message3@@/${message3}/ 
    731                 s/@@basedn@@/${basedn}/g 
    732                 s/@@ldappassword@@/${rootpw}/g" $slapdtpl > /etc/ldap/slapd.conf 
    733         cp $STATICTPLDIR/etc/default/slapd /etc/default 
    734 fi 
    735  
    736  
    737736# reparing ipcop's timezone 
    738737[ "$(LANG=C file -b /etc/timezone)" = "ASCII text" ] && timezone="$(cat /etc/timezone)" 

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

    r406 r409  
    1 # recreate pg clusters on first install 
     1# necessary to trick sophomorix 
    22if [ "$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 
    9 else 
    10     /etc/init.d/postgresql-8.1 start 
     3        pg_dropcluster 7.4 main &> /dev/null 
     4        pg_dropcluster 8.1 main &> /dev/null 
     5        pg_createcluster 8.1 main 
     6        cp $STATICTPLDIR/etc/postgresql/8.1/main/* /etc/postgresql/8.1/main 
    117fi 
     8/etc/init.d/postgresql-8.1 start 
    129 
    1310 
    … …  
    2320fi 
    2421smbpasswd -w $ldapadminpw 
    25  
    26  
    27 # adding tls support to slapd.conf 
    28 slapdtpl=/usr/share/sophomorix/config-templates/ldap/slapd-standalone.conf.template 
    29 if ! grep -q ^TLS $slapdtpl; then 
    30         cp $slapdtpl $slapdtpl.dpkg-old 
    31         cp $STATICTPLDIR$slapdtpl $slapdtpl 
    32 fi 
    3322 
    3423 
    … …  
    6049        s/@@message3@@/${message3}/ 
    6150        s/@@basedn@@/${basedn}/g 
     51        s/@@tls_comment@@//g 
    6252        s/@@ldappassword@@/${ldapadminpw}/" $template > /etc/ldap/slapd.conf 
    6353 
    … …  
    114104        addgroup openldap ssl-cert 
    115105 
    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 
     106        # create a new ldap database with tricky sophomorix 
     107        sophomorix-setup-pgldap --oldversion=0.0.0-0 --newversion=0.0.0-0 --new-database 
    120108 
    121109        # new random password for ldap db user 
    … …  
    126114        sed -e "s|^Password=.*|Password=$ldapdbpw|" -i /etc/linuxmuster/schulkonsole/db.conf 
    127115 
    128         # deactivate postgres 7.4 
    129         /etc/init.d/postgresql-7.4 stop 
    130         update-rc.d -f postgresql-7.4 remove 
    131  
    132116else 
    133117 
    … …  
    135119        if [ "$update_ldap" = "yes" ]; then 
    136120                ldapdbpw=`grep ^Password /etc/linuxmuster/schulkonsole/db.conf | awk -F\= '{ print $2 }'` 
    137                 sophomorix-setup-pgldap --slapd-standalone --dbpw "$ldapdbpw" --keep-database 
     121                sophomorix-setup-pgldap --oldversion=0.0.0-0 --newversion=0.0.0-0 --dbpw "$ldapdbpw" --keep-database 
    138122        fi 
    139123 

  • main/linuxmuster-base/trunk/var/config-dynamic/17_admins/prepatch

    r166 r409  
    1515 
    1616  # set passwords for admins 
    17   #echo -e "$adminpw\n$adminpw\n" | smbldap-passwd -e $DOMADMIN 
    1817  sophomorix-passwd --force --user $DOMADMIN --pass $adminpw 
    19   #echo -e "$adminpw\n$adminpw\n" | smbldap-passwd -e $ADMINISTRATOR 
    2018  sophomorix-passwd --user $ADMINISTRATOR --pass $adminpw 
    21   #echo -e "$pgmadminpw\n$pgmadminpw\n" | smbldap-passwd -e $PGMADMIN 
    2219  sophomorix-passwd --user $PGMADMIN --pass $pgmadminpw 
    23   #echo -e "$wwwadminpw\n$wwwadminpw\n" | smbldap-passwd -e $WWWADMIN 
    2420  sophomorix-passwd --user $WWWADMIN --pass $wwwadminpw 
     21  sophomorix-usermod -I wwwadmin 
    2522 
    2623  # create mailboxes again 
Note: See TracChangeset for help on using the changeset viewer.