Changeset 1176
- Timestamp:
- 11/28/11 12:36:16 (6 months ago)
- Location:
- main/linuxmuster-base/trunk
- Files:
-
- 1 added
- 2 deleted
- 7 edited
-
debian/changelog (modified) (1 diff)
-
debian/postinst (modified) (1 diff)
-
etc/apt/sources.list.d/paedml50.list (deleted)
-
etc/apt/sources.list.d/paedml51.list (added)
-
etc/linuxmuster/backup.conf (modified) (2 diffs)
-
share/config/dist.conf (modified) (1 diff, 1 prop)
-
share/tasks/imaging-linbo (modified) (1 diff)
-
var/config-dynamic/00_stop-services/prepatch (modified) (2 diffs)
-
var/config-dynamic/40_linbo/prepatch (modified) (1 diff, 1 prop)
-
var/config-static/etc/default/atftpd (deleted)
Legend:
- Unmodified
- Added
- Removed
-
main/linuxmuster-base/trunk/debian/changelog
r1174 r1176 1 linuxmuster-base (5.1.0-0lenny0) lenny; urgency=low 2 3 * equalized package version to paedml version. 4 * updated paedml sources.list file. 5 * dist.conf: updated paedml version furthermore using 5.0.4 iso for upgrade. 6 * backup.conf, services: changed cupsys to cups, atftpd to tftpd-hpa (closes #551, see #499). 7 * postinst: updates backup.conf as mentioned above. 8 * linuxmuster-setup: some modifications according to #499 (change atftpd to tftpd-hpa). 9 10 -- Thomas Schmitt <schmitt@lmz-bw.de> Mon, 28 Nov 2011 12:32:31 +0200 11 1 12 linuxmuster-base (1.5.37-lenny0) lenny; urgency=low 2 13 -
main/linuxmuster-base/trunk/debian/postinst
r1131 r1176 433 433 fi 434 434 435 # update backup.conf (#551, #499) 436 conf="$SYSCONFDIR/backup.conf" 437 searchstr="cupsys,cups atftpd,tftpd-hpa" 438 backup=false 439 for i in $searchstr; do 440 search="$(echo "$i" | awk -F\, '{ print $1 }')" 441 replace="$(echo "$i" | awk -F\, '{ print $2 }')" 442 if grep -qw "$search" "$conf"; then 443 echo "Replacing $search with $replace in $conf." 444 [ "$backup" = "false" ] && cp "$conf" "$conf.dpkg-bak" 445 backup=true 446 sed -e "s|$search|$replace|g" -i "$conf" 447 fi 448 done 449 435 450 # updating release information 436 451 echo "$(getdistname) $DISTFULLVERSION / Codename $CODENAME" > /etc/issue -
main/linuxmuster-base/trunk/etc/linuxmuster/backup.conf
r1081 r1176 1 1 # backup parameters for linuxmuster-back and mondoarchive 2 2 # schmitt@lmz-bw.de 3 # 4 # $Id$ 5 # 3 6 4 7 # the backup device, either a hard disk partition or a nfs share … … 45 48 # - a list of comma separated services 46 49 #services=all 47 services=cups ys,nagios3,postgresql-8.3,mysql,slapd,samba,postfix,apache2,cyrus2.2,rembo,saslauthd,clamav-daemon,rsync,atftpd,nscd,cron,bittorrent,linbo-bittorrent,linbo-multicast50 services=cups,nagios3,postgresql-8.3,mysql,slapd,samba,postfix,apache2,cyrus2.2,rembo,saslauthd,clamav-daemon,rsync,tftpd-hpa,nscd,cron,bittorrent,linbo-bittorrent,linbo-multicast 48 51 49 52 # compression level (0-9), 0 means no compression -
main/linuxmuster-base/trunk/share/config/dist.conf
- Property svn:keywords changed from Id to Id Revision
r1151 r1176 3 3 # paths related to the distribution 4 4 # don't change this, any changes will be overwritten by package upgrade 5 # 6 # $Id$ 7 # 5 8 6 9 # Version and Name 7 10 CODENAME="Glufamichel" 8 DISTMAJORVERSION="5. 0"9 DISTMINORVERSION=" 4"11 DISTMAJORVERSION="5.1" 12 DISTMINORVERSION="0" 10 13 DISTFULLVERSION="$DISTMAJORVERSION.$DISTMINORVERSION" 14 CDMAJORVERSION="5.0" 11 15 CDMINORVERSION="4" 12 CDVERSION="$ DISTMAJORVERSION.$CDMINORVERSION"16 CDVERSION="$CDMAJORVERSION.$CDMINORVERSION" 13 17 NONFREEDISTNAME="paedML Linux" 14 18 FREEDISTNAME="openML Linux" -
main/linuxmuster-base/trunk/share/tasks/imaging-linbo
r1081 r1176 1 atftpd 1 tftpd-hpa 2 2 syslinux 3 3 udpcast -
main/linuxmuster-base/trunk/var/config-dynamic/00_stop-services/prepatch
r1081 r1176 3 3 # stop all relevant services 4 4 5 services="linuxmuster-base atftpdbittorrent rsync linbo-bittorrent \5 services="linuxmuster-base tftpd-hpa bittorrent rsync linbo-bittorrent \ 6 6 linbo-multicast nagios3 atd cron rembo quota apache2 cups \ 7 7 clamav-freshclam clamav-daemon cyrus2.2 postfix saslauthd amavis \ … … 11 11 12 12 # make sure they are enabled to be able to shut them down 13 [ -e /etc/default/ atftpd ] && sed -e 's/^USE_INETD=.*/USE_INETD=false/' -i /etc/default/atftpd13 [ -e /etc/default/tftpd-hpa ] && sed -e 's/^RUN_DAEMON=.*/RUN_DAEMON=yes/' -i /etc/default/tftpd-hpa 14 14 [ -e /etc/default/rsync ] && sed -e 's/^RSYNC_ENABLE=.*/RSYNC_ENABLE=true/' -i /etc/default/rsync 15 15 [ -e /etc/default/rembo ] && sed -e 's/^START_REMBO=.*/START_REMBO=yes/' -i /etc/default/rembo -
main/linuxmuster-base/trunk/var/config-dynamic/40_linbo/prepatch
- Property svn:keywords changed from Id to Id Revision
r1081 r1176 1 # $Id$ 2 # 1 3 # check if imaging method is linbo 4 2 5 if [ "$imaging" = "linbo" ]; then 3 6 4 # patch rsyncd.secrets with admin password 5 if [ "$1" = "--first" ]; then 7 # create tftpd-hpa configs if necessary 8 tpldir="/usr/share/linuxmuster-linbo/templates" 9 tpl="$tpldir/tftpd-hpa.default" 10 conf="/etc/default/tftpd-hpa" 11 if ! grep -q "$LINBODIR" "$conf"; then 12 echo "Patching $conf." 13 backup_file "$conf" 14 sed -e "s|@@linbodir@@|$LINBODIR|" "$tpl" > "$conf" 15 fi 16 conf="/etc/tftp_remap.conf" 17 tpl="$tpldir/$(basename $conf)" 18 if [ ! -e "$conf" ]; then 19 echo "Providing $conf." 20 cp "$tpl" "$conf" 21 fi 6 22 7 [ -e /etc/rsyncd.secrets ] && backup_file /etc/rsyncd.secrets 8 if grep ^linbo: /etc/rsyncd.secrets &> /dev/null; then 9 sed -e "s/^linbo:.*/linbo:$adminpw/" -i /etc/rsyncd.secrets 10 else 11 echo "linbo:$adminpw" >> /etc/rsyncd.secrets 12 fi 23 # check for tftp in inetd.conf 24 conf=/etc/inetd.conf 25 if grep -q ^tftp "$conf"; then 26 echo "Deactivating tftp in $conf." 27 backup_file "$conf" 28 sed -e 's|^tftp|#tftp|' -i "$conf" 29 fi 13 30 14 # provide empty workstations data 15 rm -rf $SYSCONFDIR/workstations 31 # stuff to do on first time install 32 if [ "$1" = "--first" ]; then 16 33 17 else 34 # patch rsyncd.secrets with admin password 35 [ -e /etc/rsyncd.secrets ] && backup_file /etc/rsyncd.secrets 36 if grep ^linbo: /etc/rsyncd.secrets &> /dev/null; then 37 sed -e "s/^linbo:.*/linbo:$adminpw/" -i /etc/rsyncd.secrets 38 else 39 echo "linbo:$adminpw" >> /etc/rsyncd.secrets 40 fi 18 41 19 if [ "$imaging_old" = "rembo" ]; then 20 if [ -L "$SYSCONFDIR/workstations" ]; then 21 rm $SYSCONFDIR/workstations 22 else 23 backup_file $SYSCONFDIR/workstations 24 fi 25 cp $REMBOFILES/files/global/wimport_data $SYSCONFDIR/workstations 26 fi 42 # provide empty workstations data 43 rm -rf $SYSCONFDIR/workstations 27 44 28 fi 45 else # modify 29 46 30 touch $SYSCONFDIR/workstations 47 # restore workstations file from link if coming from rembo 48 if [ "$imaging_old" = "rembo" ]; then 49 if [ -L "$SYSCONFDIR/workstations" ]; then 50 rm $SYSCONFDIR/workstations 51 else 52 backup_file $SYSCONFDIR/workstations 53 fi 54 cp $REMBOFILES/files/global/wimport_data $SYSCONFDIR/workstations 55 fi 31 56 32 # patch path to wimport_data in dist.conf 33 backup_file /usr/share/linuxmuster/config/dist.conf 34 sed -e "s/^WIMPORTDATA=.*/WIMPORTDATA=\"\$SYSCONFDIR\/workstations\"/" -i /usr/share/linuxmuster/config/dist.conf 57 fi 35 58 36 # grep rsync password from rembo.conf or if that fails take simply muster as password 37 if ! grep ^linbo: /etc/rsyncd.secrets &> /dev/null; then 38 linbopw=`grep ^NetPassword /etc/rembo/rembo.conf | awk -F\" '{ print $2 }'` 39 [ -z "$linbopw" ] && linbopw=muster 40 echo "linbo:$linbopw" >> /etc/rsyncd.secrets 41 fi 42 chmod 600 /etc/rsyncd.secrets 59 touch $SYSCONFDIR/workstations 43 60 44 # check for initial configuration and copy it if necessary 45 teststr="# automatically created by linuxmuster-setup" 46 grep "$teststr" /etc/default/atftpd &> /dev/null || cp $STATICTPLDIR/etc/default/atftpd /etc/default 47 grep "$LINBODIR" /etc/default/atftpd &> /dev/null || cp $STATICTPLDIR/etc/default/atftpd /etc/default 48 grep "$teststr" /etc/rsyncd.conf &> /dev/null || cp $STATICTPLDIR/etc/rsyncd.conf /etc 61 # patch path to wimport_data in dist.conf 62 backup_file /usr/share/linuxmuster/config/dist.conf 63 sed -e "s/^WIMPORTDATA=.*/WIMPORTDATA=\"\$SYSCONFDIR\/workstations\"/" -i /usr/share/linuxmuster/config/dist.conf 49 64 50 # check for pxelinux config dir 51 # obsolete 52 #[ -d "$LINBODIR/pxelinux.cfg" ] || mkdir -p $LINBODIR/pxelinux.cfg 65 # if no linbo password then grep rsync password from rembo.conf or if that fails take simply muster as password 66 if ! grep ^linbo: /etc/rsyncd.secrets &> /dev/null; then 67 linbopw=`grep ^NetPassword /etc/rembo/rembo.conf | awk -F\" '{ print $2 }'` 68 [ -z "$linbopw" ] && linbopw=muster 69 echo "linbo:$linbopw" >> /etc/rsyncd.secrets 70 fi 71 chmod 600 /etc/rsyncd.secrets 53 72 54 # link pxelinux.0 to linbo dir 55 [ -e "$LINBODIR/pxelinux.0" ] || ln -sf /usr/lib/syslinux/pxelinux.0 $LINBODIR/pxelinux.0 73 # check for initial rsync configuration and copy it if necessary 74 teststr="# automatically created by linuxmuster-setup" 75 grep "$teststr" /etc/rsyncd.conf &> /dev/null || cp $STATICTPLDIR/etc/rsyncd.conf /etc 56 76 57 # copy default files to $LINBODIR, if they are not there already 58 # obsolete, these files are now in linbo package 59 #for i in `find $STATICTPLDIR/var/linbo/ -type f` `find /usr/share/linuxmuster/registry-patches/LINBO/ -name \*.reg`; do 60 # f=`basename $i` 61 # [ -e "$LINBODIR/$f" ] || cp $i $LINBODIR 62 #done 77 # link pxelinux.0 to linbo dir 78 [ -e "$LINBODIR/pxelinux.0" ] || ln -sf /usr/lib/syslinux/pxelinux.0 $LINBODIR/pxelinux.0 63 79 64 # open internal firewall for multicasting and rsync65 . /etc/default/linuxmuster-linbo66 if ! grep ^udp $ALLOWEDPORTS | grep -q $PORTBASE:; then67 backup_file $ALLOWEDPORTS68 PORTMAX=$PORTBASE69 let PORTMAX+=10070 PORTS=`grep ^udp $ALLOWEDPORTS | awk '{ print $2 }'`71 PORTS="$PORTS,$PORTBASE:$PORTMAX"72 sed -e "s/^udp.*/udp $PORTS/" -i $ALLOWEDPORTS73 fi74 if ! grep ^tcp $BASEPORTS | grep -qw rsync; then75 backup_file $BASEPORTS76 PORTS=`grep ^tcp $BASEPORTS | awk '{ print $2 }'`77 PORTS="$PORTS,rsync"78 sed -e "s/^tcp.*/tcp $PORTS/" -i $BASEPORTS79 fi80 # open internal firewall for multicasting and rsync 81 . /etc/default/linuxmuster-linbo 82 if ! grep ^udp $ALLOWEDPORTS | grep -q $PORTBASE:; then 83 backup_file $ALLOWEDPORTS 84 PORTMAX=$PORTBASE 85 let PORTMAX+=100 86 PORTS=`grep ^udp $ALLOWEDPORTS | awk '{ print $2 }'` 87 PORTS="$PORTS,$PORTBASE:$PORTMAX" 88 sed -e "s/^udp.*/udp $PORTS/" -i $ALLOWEDPORTS 89 fi 90 if ! grep ^tcp $BASEPORTS | grep -qw rsync; then 91 backup_file $BASEPORTS 92 PORTS=`grep ^tcp $BASEPORTS | awk '{ print $2 }'` 93 PORTS="$PORTS,rsync" 94 sed -e "s/^tcp.*/tcp $PORTS/" -i $BASEPORTS 95 fi 80 96 81 # patch start.confs with serverip82 for i in $LINBODEFAULTCONF `find $LINBODIR/ -type f -name 'start.conf*'`; do83 backup_file $i84 sed -e "s/^Server = \([0-9]\{1,3\}[.]\)\{3\}[0-9]\{1,3\}/Server = $serverip/" -i $i85 done97 # patch start.confs with serverip 98 for i in $LINBODEFAULTCONF `find $LINBODIR/ -type f -name 'start.conf*'`; do 99 backup_file $i 100 sed -e "s/^Server = \([0-9]\{1,3\}[.]\)\{3\}[0-9]\{1,3\}/Server = $serverip/" -i $i 101 done 86 102 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 103 # patch regs with workgroup 104 for i in `find $LINBODIR/ -type f -name '*.reg'`; do 105 backup_file $i 106 sed -e "s/^\"DefaultDomainName\"=.*/\"DefaultDomainName\"=\"$workgroup\"/ 107 s/^\"Workgroup\"=.*/\"Workgroup\"=\"$workgroup\"/" -i $i 108 done 92 109 93 # patch regs with workgroup 94 for i in `find $LINBODIR/ -type f -name '*.reg'`; do 95 backup_file $i 96 sed -e "s/^\"DefaultDomainName\"=.*/\"DefaultDomainName\"=\"$workgroup\"/ 97 s/^\"Workgroup\"=.*/\"Workgroup\"=\"$workgroup\"/" -i $i 98 done 110 # patch start variables of tftpd-hpa and rsync 111 sed -e "s/^RUN_DAEMON=.*/RUN_DAEMON=yes/" -i /etc/default/tftpd-hpa 112 sed -e "s/^RSYNC_ENABLE=.*/RSYNC_ENABLE=true/" -i /etc/default/rsync 99 113 100 # patch start variables of atftpd and rsync 101 sed -e "s/^USE_INETD=.*/USE_INETD=false/" -i /etc/default/atftpd 102 sed -e "s/^RSYNC_ENABLE=.*/RSYNC_ENABLE=true/" -i /etc/default/rsync 114 # check for images and start multicast 115 update-rc.d linbo-multicast defaults 116 res=`find $LINBODIR -name '*.cloop'` 117 if [ -n "$res" ]; then 118 sed -e "s/^START_MULTICAST=.*/START_MULTICAST=yes/" -i /etc/default/linuxmuster-linbo 119 /etc/init.d/linbo-multicast start 120 else 121 sed -e "s/^START_MULTICAST=.*/START_MULTICAST=no/" -i /etc/default/linuxmuster-linbo 122 fi 103 123 104 # check for images and start multicast 105 update-rc.d linbo-multicast defaults 106 res=`find $LINBODIR -name '*.cloop'` 107 if [ -n "$res" ]; then 108 sed -e "s/^START_MULTICAST=.*/START_MULTICAST=yes/" -i /etc/default/linuxmuster-linbo 109 /etc/init.d/linbo-multicast start 110 else 111 sed -e "s/^START_MULTICAST=.*/START_MULTICAST=no/" -i /etc/default/linuxmuster-linbo 112 fi 124 # linbo administrative user 125 if ! check_id linbo; then 126 linbopasswd=`grep ^linbo /etc/rsyncd.secrets | awk -F\: '{ print $2 }'` 127 if [ -n "$linbopasswd" ]; then 128 echo "Creating linbo user ..." 129 sophomorix-useradd --administrator linbo --unix-group $ADMINGROUP --shell /bin/false --gecos "LINBO Administrator" &> /dev/null || true 130 sophomorix-passwd --user linbo --pass $linbopasswd &> /dev/null || true 131 smbldap-usermod -H '[UX ]' linbo || true 132 fi 133 fi 113 134 114 # linbo administrative user 115 if ! check_id linbo; then 116 linbopasswd=`grep ^linbo /etc/rsyncd.secrets | awk -F\: '{ print $2 }'` 117 if [ -n "$linbopasswd" ]; then 118 echo "Creating linbo user ..." 119 sophomorix-useradd --administrator linbo --unix-group $ADMINGROUP --shell /bin/false --gecos "LINBO Administrator" &> /dev/null || true 120 sophomorix-passwd --user linbo --pass $linbopasswd &> /dev/null || true 121 smbldap-usermod -H '[UX ]' linbo || true 122 fi 123 fi 135 # check for linbo mail wrapper in /etc/aliases 136 if ! grep -q ^linbo: /etc/aliases; then 137 backup_file /etc/aliases 138 sed -e "/^root:/a\ 139 linbo: \"\|\/usr\/share\/linuxmuster-linbo\/mail2log.sh\"" -i /etc/aliases 140 newaliases 141 fi 124 142 125 # check for linbo mail wrapper in /etc/aliases 126 if ! grep -q ^linbo: /etc/aliases; then 127 backup_file /etc/aliases 128 sed -e "/^root:/a\ 129 linbo: \"\|\/usr\/share\/linuxmuster-linbo\/mail2log.sh\"" -i /etc/aliases 130 newaliases 131 fi 143 # change owner of logdir to nobody 144 [ -d "$LOGDIR/linbo" ] || mkdir -p $LOGDIR/linbo 145 chown nobody $LOGDIR/linbo 132 146 133 # change owner of logdir to nobody 134 [ -d "$LOGDIR/linbo" ] || mkdir -p $LOGDIR/linbo 135 chown nobody $LOGDIR/linbo 147 # start necessary services 148 /etc/init.d/tftpd-hpa start 149 /etc/init.d/rsync start 136 150 137 # start necessary services 138 /etc/init.d/atftpd start 139 /etc/init.d/rsync start 140 # don't start these on first install 141 if [ "$1" != "--first" ]; then 142 /etc/init.d/bittorrent start 143 /etc/init.d/linbo-bittorrent start 144 /etc/init.d/linbo-multicast start 145 else 146 [ -e /etc/default/bittorrent ] && sed -e 's|^START_BTTRACK=.*|START_BTTRACK=0|' -i /etc/default/bittorrent 147 [ -e /etc/default/linbo-bittorrent ] && sed -e 's|^START_BITTORRENT=.*|START_BITTORRENT=0|' -i /etc/default/linbo-bittorrent 148 [ -e /etc/default/linuxmuster-linbo ] && sed -e 's|^START_MULTICAST=.*|START_MULTICAST=no|' -i /etc/default/linuxmuster-linbo 149 fi 151 # don't start these on first install 152 if [ "$1" != "--first" ]; then 153 /etc/init.d/bittorrent start 154 /etc/init.d/linbo-bittorrent start 155 /etc/init.d/linbo-multicast start 156 else 157 [ -e /etc/default/bittorrent ] && sed -e 's|^START_BTTRACK=.*|START_BTTRACK=0|' -i /etc/default/bittorrent 158 [ -e /etc/default/linbo-bittorrent ] && sed -e 's|^START_BITTORRENT=.*|START_BITTORRENT=0|' -i /etc/default/linbo-bittorrent 159 [ -e /etc/default/linuxmuster-linbo ] && sed -e 's|^START_MULTICAST=.*|START_MULTICAST=no|' -i /etc/default/linuxmuster-linbo 160 fi 150 161 151 else 162 else # switch to rembo, deactivate linbo 152 163 153 # patch start variables of atftpdand rsync154 [ -e /etc/default/atftpd ] && backup_file /etc/default/atftpd ; sed -e "s/^USE_INETD=.*/USE_INETD=true/" -i /etc/default/atftpd 155 [ -e /etc/default/rsync ] && backup_file /etc/default/rsync ; sed -e "s/^RSYNC_ENABLE=.*/RSYNC_ENABLE=false/" -i /etc/default/rsync156 [ -e /etc/default/linuxmuster-linbo ] && backup_file /etc/default/linuxmuster-linbo ; sed -e "s/^START_MULTICAST=.*/START_MULTICAST=no/" -i /etc/default/linuxmuster-linbo164 # patch start variables of tftpd-hpa and rsync 165 [ -e /etc/default/tftpd-hpa ] && backup_file /etc/default/tftpd-hpa ; sed -e "s/^RUN_DAEMON=.*/RUN_DAEMON=no/" -i /etc/default/tftpd-hpa 166 [ -e /etc/default/rsync ] && backup_file /etc/default/rsync ; sed -e "s/^RSYNC_ENABLE=.*/RSYNC_ENABLE=false/" -i /etc/default/rsync 167 [ -e /etc/default/linuxmuster-linbo ] && backup_file /etc/default/linuxmuster-linbo ; sed -e "s/^START_MULTICAST=.*/START_MULTICAST=no/" -i /etc/default/linuxmuster-linbo 157 168 158 # remove tftp from inetd.conf 159 if grep -q tftp /etc/inetd.conf; then 160 backup_file /etc/inetd.conf 161 grep -v tftp /etc/inetd.conf > /var/tmp/inetd.conf 162 mv /var/tmp/inetd.conf /etc 163 fi 164 165 # remove linbo mail wrapper from /etc/aliases 166 if grep -q ^linbo: /etc/aliases; then 167 backup_file /etc/aliases 168 grep -v ^linbo: /etc/aliases > /var/tmp/aliases 169 mv /var/tmp/aliases /etc/aliases 170 newaliases 171 fi 169 # remove linbo mail wrapper from /etc/aliases 170 if grep -q ^linbo: /etc/aliases; then 171 backup_file /etc/aliases 172 grep -v ^linbo: /etc/aliases > /var/tmp/aliases 173 mv /var/tmp/aliases /etc/aliases 174 newaliases 175 fi 172 176 173 177 fi
Note: See TracChangeset
for help on using the changeset viewer.
