Changeset 1206


Ignore:
Timestamp:
01/14/12 11:52:16 (4 months ago)
Author:
tschmitt
Message:
  • linuxmuster-base/trunk mit branches/testing zusammengeführt.
Location:
main/linuxmuster-base/branches/testing
Files:
2 deleted
24 edited
5 copied

Legend:

Unmodified
Added
Removed

  • main/linuxmuster-base/branches/testing

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

    r1073 r1206  
     1linuxmuster-base (5.1.0-3lenny0) lenny; urgency=low 
     2 
     3  * paedml51-upgrade: 
     4    - fixed -f parameter (closes #563). 
     5    - removing libc6-i686 at begin of dist-upgrade (if installed) to avoid 
     6      upgrade problems, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454557 
     7      (closes #560). 
     8  * linuxmuster-patch: 
     9    - ensures the right imaging task is installed if imaging is changed in modify mode. 
     10 
     11 -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 10 Jan 2012 12:31:32 +0100 
     12 
     13linuxmuster-base (5.1.0-2lenny0) lenny; urgency=low 
     14 
     15  * linuxmuster-setup: 
     16    - removed installation options for integrated firewall and rembo. 
     17    - changed cdrom package repository to /var/cache/apt/archives. 
     18  * linuxmuster-prepare: added finish-install.d/06linuxmuster to copy all debs 
     19    to /var/cache/apt/archives to be able to continue setup without cdrom after reboot. 
     20  * paedml51-upgrade: 
     21    - changed cdrom package repository also to /var/cache/apt/archives. 
     22    - added check for integrated firewall. 
     23    - hiding console message if cdrom cannot be unmounted. 
     24 
     25 -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 17 Dec 2011 22:37:49 +0100 
     26 
     27linuxmuster-base (5.1.0-1lenny0) lenny; urgency=low 
     28 
     29  * linuxmuster-setup: various modifications due to #77 (cdrom package repository 
     30    will be copied to /var/cache/linuxmuster/pkgs during stage 1, therefore cdrom 
     31    is no more needed after reboot). 
     32  * changed version in upgrade scripts. 
     33  * removed 5.0 upgrade text in doc. 
     34  * paedml51-upgrade: changed local repo dir also to /var/cache/linuxmuster/pkgs 
     35    to be equal to linuxmuster-setup. 
     36  * changed codename to "NiveauLINBO". 
     37 
     38 -- Thomas Schmitt <schmitt@lmz-bw.de>  Thu, 15 Dec 2011 20:03:43 +0100 
     39 
     40linuxmuster-base (5.1.0-0lenny0) lenny; urgency=low 
     41 
     42  * equalized package version to paedml version. 
     43  * updated paedml sources.list file. 
     44  * dist.conf: updated paedml version furthermore using 5.0.4 iso for upgrade. 
     45  * backup.conf, services: changed cupsys to cups, atftpd to tftpd-hpa (closes #551, see #499). 
     46  * postinst: updates backup.conf as mentioned above, removes old paedml50.list. 
     47  * linuxmuster-setup: some modifications according to #499 (change atftpd to tftpd-hpa), paedml sources.list update. 
     48  * added firmware packages to server task. 
     49 
     50 -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 29 Nov 2011 10:13:38 +0100 
     51 
     52linuxmuster-base (1.5.37-lenny0) lenny; urgency=low 
     53 
     54  * paedml50-upgrade: 
     55    * more improvements according to #531. 
     56    * changed apt-get back to aptitude. 
     57  * linuxmuster-setup: 
     58    * implemented linbo as default imaging method. 
     59    * added 'aptitude::CmdLine::Ignore-Trust-Violations "true";' to temporary 
     60      apt configuration. 
     61 
     62 -- Thomas Schmitt <schmitt@lmz-bw.de>  Wed, 19 Oct 2011 11:28:15 +0200 
     63 
     64linuxmuster-base (1.5.36-lenny0) lenny; urgency=low 
     65 
     66  * paedml50-upgrade: 
     67    * uses now apt-get instead of aptitude. 
     68    * improved error handling in conjunction with package dependencies. 
     69    * improved handling of postgresql upgrade. 
     70    * improved logging. 
     71    * reworked commandline options: 
     72      -c: Upgrade with cdrom in drive. 
     73      -d: Online-Upgrade with iso download. 
     74      -f: Force upgrade whithout version test. 
     75      -i: ISO file to use for upgrade. 
     76    * fixed deinstallation of linuxmuster-base during upgrade (closes #531). 
     77  * linuxmuster-setup: 
     78    * removes LINBO's torrent files if serverip has changed (closes #531). 
     79    * implemented linbo as default imaging method. 
     80  * Version increased to 5.0.4. 
     81 
     82 -- Thomas Schmitt <schmitt@lmz-bw.de>  Sun, 16 Oct 2011 11:03:48 +0200 
     83 
     84linuxmuster-base (1.5.35-lenny1) lenny; urgency=low 
     85 
     86  * linuxmuster-setup: fixed networking start command 
     87 
     88 -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 27 Sep 2011 13:09:58 +0200 
     89 
     90linuxmuster-base (1.5.35-lenny0) lenny; urgency=low 
     91 
     92  * paedml50-upgrade.sh: 
     93    * removes /usr/lib/cups/backend/dnssd at the beginning (closes #522). 
     94    * fixed typo in local.list file name. 
     95  * linuxmuster-setup: starts "dpkg-reconfigure linuxmuster-nagios-fernueberwachung" 
     96    in case of domainname change if package is installed (see #215). 
     97  * postinst: 
     98    * removes local.list which was not removed by upgrade script (because of typo, see above). 
     99    * removed obsolete sophomorix nscd patch.  
     100 
     101 -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 24 Sep 2011 12:57:20 +0200 
     102 
     103linuxmuster-base (1.5.34-lenny0) lenny; urgency=low 
     104 
     105  * increased version to 5.0.3. 
     106  * dist.conf: introduced new environment variables CDMINORVERSION and CDVERSION. 
     107  * linuxmuster-backup: adds /sbin/portmap to /etc/mindi/deplist.d/netconf (closes #515). 
     108 
     109 -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 13 Sep 2011 13:59:15 +0200 
     110 
     111linuxmuster-base (1.5.33-lenny0) lenny; urgency=low 
     112 
     113  * paedml50-upgrade.sh: 
     114    * removes and recreates remoteadmin-account if detected (closes #489). 
     115    * minor improvements in upgrade sequence. 
     116  * remoteadmin.sh, minor improvements according to #489: 
     117    * creates remoteadmin group now as a system group. 
     118    * invokation with "NOPASSWD=yes" as a prefix of the linuxmuster-remoteadmin command allows passwordless creation of account: 
     119      # NOPASSWD=yes linuxmuster-remoteadmin --create. 
     120  * postinst: fixed revision check for slapd.conf upgrade. 
     121 
     122 -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 26 Jul 2011 08:49:21 +0200 
     123 
     124linuxmuster-base (1.5.32-lenny0) lenny; urgency=low 
     125 
     126  * update-logins.sh: filters now ip address prefix of smbstatus output (closes #486). 
     127  * paedml50-upgrade.sh, minor improvements: reinstalls linuxmuster-mrbs and linuxmuster-portfolio if detected. 
     128 
     129 -- Thomas Schmitt <schmitt@lmz-bw.de>  Fri, 22 Jul 2011 10:39:11 +0200 
     130 
     131linuxmuster-base (1.5.31-lenny1) lenny; urgency=low 
     132 
     133  * paedml50-upgrade.sh, minor fixes: 
     134    * ldap configuration file backup: no backup if it does not exist. 
     135    * not starting import_workstations if workstation data file is empty. 
     136    * creating temporary local package repository from apt's archive cache to force the use of more recent cdrom packages. 
     137    * added extra check for linuxmuster-pykota to be sure it will be reinstalled during upgrade. 
     138    * increased required free space under /var to 1.5 GB. 
     139  * linuxmuster-task, fix: temporary apt.conf configuration of paedml50-upgrade.sh was overwritten (closes #485). 
     140 
     141 -- Thomas Schmitt <schmitt@lmz-bw.de>  Thu, 21 Jul 2011 20:33:39 +0200 
     142 
     143linuxmuster-base (1.5.31-lenny0) lenny; urgency=low 
     144 
     145  * increased version to 5.0.2. 
     146  * paedml50-upgrade.sh, fix: 
     147    * linuxmuster remote monitoring packages were deinstalled during upgrade (closes #470). 
     148    * fixed missing horde columns (closes #477). 
     149  * smb.conf.shares: added a sample share for programs which need write permissions (closes #466). According to this: 
     150    * dist.conf: added new constant PROGSRWDIR (/home/samba/pgmw). 
     151    * postinst: creates $PROGSRWDIR and adds share and mapping examples if necessary. 
     152    * login.bat: added mapping example for pgmw share. 
     153  * linuxmuster-setup: updated moodle database template to version 1.9.12+20110518. 
     154  * linuxmuster-backup: another separator fix for excludedirs in mondarchive invokation line (closes finally #462). 
     155 
     156 -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 16 Jul 2011 12:35:22 +0200 
     157 
    1158linuxmuster-base (1.5.30-lenny0) lenny; urgency=low 
    2159 

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

    r787 r1206  
    1 doc/*                           usr/share/doc/linuxmuster-base/ 
    21etc/*                           etc/ 
    32sbin/*                  usr/sbin/ 

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

    r1075 r1206  
    6969 
    7070  # check all necessary dirs and links and create them if needed 
    71   for i in $NETLOGONDIR $PROGSDIR $CDSDIR $BACKUPDIR $BACKUPMNTPOINT $LOGINCACHE $LOGDIR; do 
     71  for i in $NETLOGONDIR $PROGSDIR $PROGSRWDIR $CDSDIR $BACKUPDIR $BACKUPMNTPOINT $LOGINCACHE $LOGDIR; do 
    7272   [ -d "$i" ] || mkdir -p $i 
    7373  done 
    … …  
    177177   # update slapd.conf 
    178178   conf=/etc/ldap/slapd.conf 
    179    rev=873 
    180    id="$(basename $conf) $rev" 
    181    if ! grep -q "$id" $conf; then 
     179   minrev=873 
     180   currev="$(grep "# \$Id\:" "$conf" | awk '{ print $4 }')" 
     181   if [ $minrev -gt $currev ]; then 
    182182    confbak=${conf}.dpkg-old 
    183183    template=$DYNTPLDIR/15_ldap/$(basename $conf) 
    … …  
    262262   find $NETLOGONDIR/ -type d -exec chmod 775 '{}' \; 
    263263   chown $ADMINISTRATOR:$DOMADMINS $NETLOGONDIR -R 
     264   # see #466 
     265   chown $ADMINISTRATOR:$DOMADMINS $SAMBAHOME 
     266   chown $ADMINISTRATOR:$DOMADMINS $SAMBAHOME/* 
     267   chmod 775 $SAMBAHOME/* 
    264268 
    265269   # linking registry-patches to administrator's home (1.2-15) 
    … …  
    403407   fi 
    404408 
    405    # nscd-patch for SophomorixBase.pm (#56 & #64) 
    406    sophover=2213 
    407    pkgver="$(dpkg -s sophomorix-base | grep Version | awk '{ print $2 }' | awk -F\- '{ print $1 }' | sed -e 's|\.||g')" 
    408    if [ "$pkgver" -le "$sophover" ]; then 
    409     conf=/usr/share/perl5/Sophomorix/SophomorixBase.pm 
    410     if grep -q "system(\"/usr/sbin/nscd -i passwd -i group -i hosts\")\;" $conf; then 
    411      echo "Patching SophomorixBase.pm ..." 
    412      cp $conf $conf.dpkg-bak 
    413      sed -e 's|system("/usr/sbin/nscd -i passwd -i group -i hosts");|system("/usr/sbin/nscd -i passwd");\ 
    414         system("/usr/sbin/nscd -i group");\ 
    415         system("/usr/sbin/nscd -i hosts");|' -i $conf 
    416      for i in passwd group hosts; do 
    417       nscd -i $i 
    418      done 
    419     fi 
    420    fi 
     409   # add writable program share (#466) 
     410   searchstr="\[pgmw\]" 
     411   conf=/etc/samba/smb.conf.shares 
     412   if ! grep -q "$searchstr" $conf; then 
     413    echo "Adding example share to $conf." 
     414    cp $conf $conf.dpkg-bak 
     415    cp $STATICTPLDIR/$conf $conf 
     416    grep -v "# custom share definitions" $conf.dpkg-bak >> $conf 
     417   fi 
     418   searchstr="M: pgmw" 
     419   conf=$NETLOGONDIR/login.bat 
     420   if ! grep -q "$searchstr" $conf; then 
     421    echo "Adding example mapping to $conf." 
     422    addstr="rem call \\\\\\\\$servername\\\netlogon\\\logon.bat H: %USERNAME% K: pgm M: pgmw R: cdrom" 
     423    cp $conf $conf.dpkg-bak 
     424    sed "/^:winnt/a\ 
     425$addstr" -i $conf 
     426    chown $ADMINISTRATOR:$DOMADMINS ${conf}* 
     427    chmod 664 ${conf}* 
     428   fi 
     429 
     430   # remove local.list not removed by upgrade script 
     431   if [ -e /var/log/linuxmuster/paedml50-upgrade.log ]; then 
     432    grep -q /var/cache/apt/archives /etc/apt/sources.list.d/local.list &> /dev/null && rm /etc/apt/sources.list.d/local.list 
     433   fi 
     434 
     435   # remove old paedml50.list 
     436   conf="/etc/apt/sources.list.d/paedml50.list" 
     437   [ -e "$conf" ] && mv "$conf" "$conf.dpkg-bak" 
     438 
     439   # update backup.conf (#551, #499) 
     440   conf="$SYSCONFDIR/backup.conf" 
     441   searchstr="cupsys,cups atftpd,tftpd-hpa" 
     442   backup=false 
     443   for i in $searchstr; do 
     444    search="$(echo "$i" | awk -F\, '{ print $1 }')" 
     445    replace="$(echo "$i" | awk -F\, '{ print $2 }')" 
     446    if grep -qw "$search" "$conf"; then 
     447     echo "Replacing $search with $replace in $conf." 
     448     [ "$backup" = "false" ] && cp "$conf" "$conf.dpkg-bak" 
     449     backup=true 
     450     sed -e "s|$search|$replace|g" -i "$conf" 
     451    fi 
     452   done 
    421453 
    422454   # updating release information 

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

    r1064 r1206  
    136136Type: select 
    137137Choices: ${img_choices} 
     138Default: linbo 
    138139Description: Imaging-System: 
    139140 Waehlen Sie das zu verwendende Imaging-System. 

  • main/linuxmuster-base/branches/testing/etc/linuxmuster/backup.conf

    r787 r1206  
    11# backup parameters for linuxmuster-back and mondoarchive 
    22# schmitt@lmz-bw.de 
     3# 
     4# $Id$ 
     5# 
    36 
    47# the backup device, either a hard disk partition or a nfs share 
    … …  
    4548#               - a list of comma separated services 
    4649#services=all 
    47 services=cupsys,nagios3,postgresql-8.3,mysql,slapd,samba,postfix,apache2,cyrus2.2,rembo,saslauthd,clamav-daemon,rsync,atftpd,nscd,cron,bittorrent,linbo-bittorrent,linbo-multicast 
     50services=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 
    4851 
    4952# compression level (0-9), 0 means no compression 

  • main/linuxmuster-base/branches/testing/sbin/linuxmuster-backup

    r1073 r1206  
    1616. $HELPERFUNCTIONS || exit 1 
    1717 
    18  
    1918# default values 
     19deplistdir=/etc/mindi/deplist.d 
     20netconf=$deplistdir/net.conf 
    2021mondocache=/var/cache/mondo 
    2122cachefiles="difflevel.0" 
    … …  
    128129} # error 
    129130 
    130  
    131131# create mountpoint if necessary 
    132132[ -d "$mountpoint" ] || mkdir -p $mountpoint 
    … …  
    325325 
    326326 
     327# portmap is needed in mondorescue's iso file system 
     328[ -d "$deplistdir" ] || mkdir -p $deplistdir 
     329[ -e "$netconf" ] || touch "$netconf" 
     330if ! grep -q ^/sbin/portmap "$netconf"; then 
     331 echo "Adding /sbin/portmap to $netconf ..." 
     332 echo "/sbin/portmap" >> "$netconf" 
     333fi 
     334 
     335 
    327336# starting mondoarchive 
    328337if [ $RC -eq 0 ]; then 
    329         nice -n 19 mondoarchive $btypeparam -p $isoprefix $rtypeparam -I "$includedirs" -E "$mountpoint $excludedirs" -N -d $target -s ${mediasize}m -$compression -L 
     338        nice -n 19 mondoarchive $btypeparam -p $isoprefix $rtypeparam -I "$includedirs" -E "${mountpoint}|${excludedirs}" -N -d $target -s ${mediasize}m -$compression -L 
    330339        RC=$? 
    331340fi 

  • main/linuxmuster-base/branches/testing/sbin/linuxmuster-setup

    r1045 r1206  
    3333  echo 
    3434  exit 1 
    35 } 
    36  
    37 # mount installation cdrom 
    38 mount_cdrom() { 
    39  local device=$1 
    40  [ -n "$device" ] && device="/dev/$device" 
    41  mount $device /cdrom &> /dev/null 
    42  if grep -q "[op][pa][e][nd]ML Linux" /cdrom/.disk/info &> /dev/null; then 
    43   return 0 
    44  else 
    45   umount /cdrom &> /dev/null 
    46   return 1 
    47  fi 
    4835} 
    4936 
    … …  
    9986  --first) 
    10087 
    101     # copy apt configs if not on first boot 
    102     if [ -z "$firstboot" ]; then 
    103      cp /etc/apt/sources.list /etc/apt/sources.list.orig 
    104      cp -a $STATICTPLDIR/etc/apt/* /etc/apt 
     88    # create local package repository 
     89    if [ -n "$firstboot" ]; then 
     90     echo "Creating local repository ..." | tee -a $logfile 
     91     cd /var/cache/apt/archives 
     92     apt-ftparchive packages ./ > Packages | tee -a $logfile 
     93     cd ~ 
     94     echo "deb file:///var/cache/apt/archives ./" > /etc/apt/sources.list | tee -a $logfile 
     95    else # renew complete apt configuration 
     96     echo "Resetting apt configuration." | tee -a $logfile 
     97     cp -a $STATICTPLDIR/etc/apt/* /etc/apt | tee -a $logfile 
    10598    fi 
    10699 
    … …  
    111104    id cyrus &> /dev/null || useradd -c "Cyrus Mailsystem User" -d /var/spool/cyrus -g mail -m -r -s /bin/sh cyrus | tee -a $logfile 
    112105 
    113     # mount cdrom 
    114     if grep -q ^"deb cdrom" /etc/apt/sources.list; then 
    115         eject -t &> /dev/null 
    116         for i in "" scd0 scd1 scd2; do 
    117          if mount_cdrom "$i"; then 
    118           if stringinstring scd "$i"; then 
    119            rm -f /dev/cdrom /dev/dvd 
    120            ln -s /dev/$i /dev/cdrom 
    121            ln -s /dev/$i /dev/dvd 
    122            cp /etc/fstab /etc/fstab.linuxmuster-setup.first 
    123            grep -v cdrom /etc/fstab.linuxmuster-setup.first > /etc/fstab 
    124            echo "/dev/$i /media/cdrom0 udf,iso9660 user,noauto 0 0" >> /etc/fstab 
    125           fi 
    126           cdrom_mounted=yes 
    127           break 
    128          fi 
    129         done 
    130         if [ -z "$cdrom_mounted" ]; then 
    131          echo "Fatal: Cannot mount install cd!" 
    132          exit 1 
    133         fi 
     106    # install paedml release key 
     107    relkey="$CACHEDIR/paedml-release.asc" 
     108    if [ -e "$relkey" ]; then 
     109     echo "Installing paedml release key." | tee -a $logfile 
     110     apt-key add "$relkey" | tee -a $logfile 
    134111    fi 
    135112 
    136     # install paedml release key 
    137     [ -e /cdrom/paedml-release.asc ] && apt-key add /cdrom/paedml-release.asc 
    138  
    139113    # check tasks 
    140     for i in common server desktop imaging-linbo imaging-rembo; do 
     114    for i in common server imaging-linbo; do 
    141115      if [ ! -s "/usr/share/linuxmuster/tasks/$i" ]; then 
    142         echo "Error: Taskfile $i not found!" 
     116        echo "Error: Taskfile $i not found!" | tee -a $logfile 
    143117        exit 1 
    144118      fi 
    … …  
    147121    # force apt to do ugly things during upgrade 
    148122    echo 'DPkg::Options {"--force-confold";"--force-confdef";"--force-bad-verify";"--force-overwrite";};' > /etc/apt/apt.conf.d/99upgrade 
     123    echo 'aptitude::CmdLine::Ignore-Trust-Violations "true";' >> /etc/apt/apt.conf.d/99upgrade 
    149124 
    150125    # check for installable non-free packages 
    … …  
    153128 
    154129    # tweaking buggy sophomorix, install postgresql first 
     130    aptitude update | tee -a $logfile 
    155131    DEBIAN_FRONTEND=noninteractive aptitude -y install postgresql | tee -a $logfile 
    156132    #DEBIAN_FRONTEND=noninteractive aptitude -y install postgresql-8.1 | tee -a $logfile 
    157133 
    158134    # installing depending task 
    159     for i in common server; do 
     135    for i in common server imaging-linbo; do 
    160136      task=`cat /usr/share/linuxmuster/tasks/$i` 
    161137      DEBIAN_FRONTEND=noninteractive aptitude -y install $task | tee -a $logfile 
    … …  
    179155 
    180156    # remove upgrade cheat 
    181     rm /etc/apt/apt.conf.d/99upgrade 
     157    rm -f /etc/apt/apt.conf.d/99upgrade 
     158    rm -f /var/cache/apt/archives/Packages 
    182159 
    183160    ;; 

  • main/linuxmuster-base/branches/testing/sbin/linuxmuster-task

    • Property svn:keywords changed from Id to Id Revision
    r666 r1206  
    44# installs software tasks 
    55# 
    6 # 24.06.2008 
    7 # Thomas Schmitt <schmitt@lmz-bw.de> 
     6# $Id$ 
    87# 
    98 
    … …  
    4948if [ -n "$unattended" ]; then 
    5049 
    51         echo 'DPkg::Options {"--force-confold";"--force-confdef";};' > /etc/apt/apt.conf.d/99upgrade 
     50        echo 'DPkg::Options {"--force-confold";"--force-confdef";};' > /etc/apt/apt.conf.d/98linuxmuster-task 
    5251        opt="-y $opt" 
    5352 
    … …  
    5756$cmd $opt $taskpackages ; RC=$? 
    5857 
    59 [ -n "$unattended" ] && rm /etc/apt/apt.conf.d/99upgrade 
     58[ -n "$unattended" ] && rm /etc/apt/apt.conf.d/98linuxmuster-task 
    6059 
    6160exit $RC 

  • main/linuxmuster-base/branches/testing/share/config/dist.conf

    • Property svn:keywords changed from Id to Id Revision
    r1023 r1206  
    33# paths related to the distribution 
    44# don't change this, any changes will be overwritten by package upgrade 
     5# 
     6# $Id$ 
     7# 
    58 
    69# Version and Name 
    7 CODENAME="Glufamichel" 
    8 DISTMAJORVERSION="5.0" 
    9 DISTMINORVERSION="1" 
     10CODENAME="NiveauLINBO" 
     11DISTMAJORVERSION="5.1" 
     12DISTMINORVERSION="0" 
    1013DISTFULLVERSION="$DISTMAJORVERSION.$DISTMINORVERSION" 
     14CDMAJORVERSION="5.1" 
     15CDMINORVERSION="0" 
     16CDVERSION="$CDMAJORVERSION.$CDMINORVERSION" 
    1117NONFREEDISTNAME="paedML Linux" 
    1218FREEDISTNAME="openML Linux" 
    13 NONFREECDNAME=$(echo $NONFREEDISTNAME | awk '{ print $1 }')$(echo $DISTFULLVERSION | sed -e 's/\.//g')_i386.iso 
    14 FREECDNAME=$(echo $FREEDISTNAME | awk '{ print $1 }')$(echo $DISTFULLVERSION | sed -e 's/\.//g')_i386.iso 
     19NONFREECDNAME=$(echo $NONFREEDISTNAME | awk '{ print $1 }')$(echo $CDVERSION | sed -e 's/\.//g')_i386.iso 
     20FREECDNAME=$(echo $FREEDISTNAME | awk '{ print $1 }')$(echo $CDVERSION | sed -e 's/\.//g')_i386.iso 
    1521ISOURL=http://lml.support-netz.de/open/iso 
    1622 
    … …  
    118124NETLOGONDIR="$SAMBAHOME/netlogon" 
    119125PROGSDIR="$SAMBAHOME/progs" 
     126PROGSRWDIR="$SAMBAHOME/pgmw" 
    120127CDSDIR="$SAMBAHOME/cds" 
    121128 

  • main/linuxmuster-base/branches/testing/share/scripts/linuxmuster-config

    r1073 r1206  
    2525  oldvalues=yes 
    2626fi 
    27  
    28 # check which imaging software is available 
    29 linbo=`aptitude search linuxmuster-linbo` 
    30 rembo=`aptitude search myshn` 
    3127 
    3228if [ "$1" = "--first" ]; then 
    … …  
    163159 
    164160 
    165 # firewall 
    166 db_fset linuxmuster-base/fwconfig seen false 
    167 db_input $PRIORITY linuxmuster-base/fwconfig || true 
    168 db_go 
    169 db_get linuxmuster-base/fwconfig || true 
    170 fwconfig=$RET 
     161# firewall (obsolet) 
     162#db_fset linuxmuster-base/fwconfig seen false 
     163#db_input $PRIORITY linuxmuster-base/fwconfig || true 
     164#db_go 
     165#db_get linuxmuster-base/fwconfig || true 
     166#fwconfig=$RET 
    171167# check if fwconfig has been modified 
    172 if [ "$oldvalues" = "yes" ]; then 
    173         [ "$fwconfig" = "$fwconfig_old" ] || ask_ipcop=yes 
    174 fi 
    175  
    176  
     168#if [ "$oldvalues" = "yes" ]; then 
     169#       [ "$fwconfig" = "$fwconfig_old" ] || ask_ipcop=yes 
     170#fi 
    177171# configure external network only if fwconfig is integrated or setup is in modify mode and fwconfig has not changed 
    178 if [ "$fwconfig" = "integrated" ]; then 
    179         externconfig 
    180 else 
    181         if [ "$1" = "--modify" ]; then 
    182                 [ "$fwconfig" = "$fwconfig_old" ] && externconfig 
    183         fi 
    184 fi 
     172#if [ "$fwconfig" = "integrated" ]; then 
     173#       externconfig 
     174#else 
     175#       if [ "$1" = "--modify" ]; then 
     176#               [ "$fwconfig" = "$fwconfig_old" ] && externconfig 
     177#       fi 
     178#fi 
     179 
     180# firewall is always dedicated 
     181fwconfig=dedicated 
     182db_set linuxmuster-base/fwconfig $fwconfig || true 
     183[ "$1" = "--modify" ] && externconfig 
    185184 
    186185 
    … …  
    196195 
    197196 
     197 
     198# check whether rembo is available 
     199rembo=`aptitude search myshn` 
     200[ "$1" = "--first" ] && rembo="" 
     201 
    198202# imaging system 
    199 imaging="" 
    200 if [[ -n "$linbo" && -n "$rembo" ]]; then 
     203imaging="linbo" 
     204if [ -n "$rembo" ]; then 
    201205 
    202206        IMG_CHOICES="linbo, rembo" 
    203207        IMG_DESC="LINBO [linbo] und Rembo/mySHN (tm) [rembo]." 
    204  
    205 elif [ -n "$linbo" ]; then 
    206  
    207         imaging=linbo 
    208  
    209 elif [ -n "$rembo" ]; then 
    210  
    211         imaging=rembo 
    212208 
    213209fi 

  • main/linuxmuster-base/branches/testing/share/scripts/linuxmuster-patch

    r699 r1206  
    2929done 
    3030 
    31 # installing apropriate imaging task 
    32 if [[ "$imaging" = "linbo" || "$imaging" = "rembo" || "$imaging" = "tivoli" ]]; then 
    33         echo 'DPkg::Options {"--force-confold";"--force-confdef";"--force-bad-verify";"--force-overwrite";};' > /etc/apt/apt.conf.d/99upgrade 
    34         task=`cat /usr/share/linuxmuster/tasks/imaging-$imaging` 
    35         export DEBIAN_FRONTEND=noninteractive 
    36         echo -n "Ja\nJa\n" | aptitude -y install $task | tee -a $LOGDIR/setup.log 
    37         rm /etc/apt/apt.conf.d/99upgrade 
    38 fi 
    39  
    4031# escaping special characters in passwords 
    4132esc_spec_chars "$adminpw" 
    … …  
    5142adminpw_md5=`echo -n $adminpw | md5sum | cut -c -32` 
    5243 
    53 # reading old values 
     44# only in modify mode 
    5445if [ "$1" != "--first" ]; then 
    55   echo "Checking for modified values ..." 
    56   . $OLDVALUES || exit 1 
    57   rm $OLDVALUES 
     46 # to be sure imaging packages are installed in case of imaging change 
     47 linuxmuster-task --unattended --install=imaging-$imaging 
     48 
     49 # reading old values 
     50 echo "Checking for modified values ..." 
     51 . $OLDVALUES || exit 1 
     52 rm $OLDVALUES 
    5853fi 
    5954 

  • main/linuxmuster-base/branches/testing/share/scripts/remoteadmin.sh

    r827 r1206  
    111111 
    112112create_account() { 
    113  useradd -c "Remote Admin" -d $ADMINSHOME/$REMOTEADMIN -r -s /bin/bash $REMOTEADMIN 
    114  mkdir -p $ADMINSHOME/$REMOTEADMIN 
    115  chown $REMOTEADMIN:$REMOTEADMIN $ADMINSHOME/$REMOTEADMIN -R 
    116  chmod 700 $ADMINSHOME/$REMOTEADMIN 
    117  passwd $REMOTEADMIN 
    118  add_to_sudoers 
    119  do_accessconf add 
     113 delgroup $REMOTEADMIN &> /dev/null 
     114 if addgroup --system $REMOTEADMIN; then 
     115  useradd -c "Remote Admin" -g $REMOTEADMIN -d $ADMINSHOME/$REMOTEADMIN -r -s /bin/bash $REMOTEADMIN 
     116  mkdir -p $ADMINSHOME/$REMOTEADMIN 
     117  chown $REMOTEADMIN:$REMOTEADMIN $ADMINSHOME/$REMOTEADMIN -R 
     118  chmod 700 $ADMINSHOME/$REMOTEADMIN 
     119  [ "$NOPASSWD" = "yes" ] || passwd $REMOTEADMIN 
     120  add_to_sudoers 
     121  do_accessconf add 
     122 else 
     123  echo "Failed to create system group $REMOTEADMIN!" 
     124  return 1 
     125 fi 
    120126} 
    121127 
    … …  
    130136 else 
    131137  id $REMOTEADMIN &> /dev/null && deluser $REMOTEADMIN 
     138  delgroup $REMOTEADMIN &> /dev/null 
    132139 fi 
    133140 rm -rf $ADMINSHOME/$REMOTEADMIN 

  • main/linuxmuster-base/branches/testing/share/scripts/update-logins.sh

    r1062 r1206  
    3535# save samba status 
    3636status=$LOGINCACHE/.smbstatus.$$ 
    37 $SMBSTATUS -b > $status 
     37$SMBSTATUS -b | sed 's|__ffff_||g' > $status 
    3838 
    3939# process given rooms 

  • main/linuxmuster-base/branches/testing/share/tasks/imaging-linbo

    r787 r1206  
    1 atftpd 
     1tftpd-hpa 
    22syslinux 
    33udpcast 

  • main/linuxmuster-base/branches/testing/share/tasks/server

    r819 r1206  
    1717cyrus-pop3d-2.2 
    1818dhcp3-server 
     19firmware-linux-free 
     20firmware-linux-nonfree 
    1921foomatic-filters-ppds 
    2022gollem 

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

    r956 r1206  
    33# stop all relevant services 
    44 
    5 services="linuxmuster-base atftpd bittorrent rsync linbo-bittorrent \ 
     5services="linuxmuster-base tftpd-hpa bittorrent rsync linbo-bittorrent \ 
    66          linbo-multicast nagios3 atd cron rembo quota apache2 cups \ 
    77          clamav-freshclam clamav-daemon cyrus2.2 postfix saslauthd amavis \ 
    … …  
    1111 
    1212# 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/atftpd 
     13[ -e /etc/default/tftpd-hpa ] && sed -e 's/^RUN_DAEMON=.*/RUN_DAEMON=yes/' -i /etc/default/tftpd-hpa 
    1414[ -e /etc/default/rsync ] && sed -e 's/^RSYNC_ENABLE=.*/RSYNC_ENABLE=true/' -i /etc/default/rsync 
    1515[ -e /etc/default/rembo ] && sed -e 's/^START_REMBO=.*/START_REMBO=yes/' -i /etc/default/rembo 

  • main/linuxmuster-base/branches/testing/var/config-dynamic/01_network/postpatch

    r787 r1206  
    44# start networking 
    55/etc/init.d/linuxmuster-nic-setup assign 
    6 /etc/rcS.d/S40networking start 
     6/etc/init.d/networking restart 
    77 
    88# set host and domain name 

  • main/linuxmuster-base/branches/testing/var/config-dynamic/17_admins/login.bat

    r787 r1206  
    44 
    55:winnt 
     6rem call \\@@servername@@\netlogon\logon.bat H: %USERNAME% K: pgm M: pgmw R: cdrom 
    67call \\@@servername@@\netlogon\logon.bat H: %USERNAME% K: pgm R: cdrom 
    78goto ende 

  • main/linuxmuster-base/branches/testing/var/config-dynamic/20_moodle/moodle.psql

    r787 r1206  
    22-- PostgreSQL database dump 
    33-- 
     4 
     5SET client_encoding = 'UTF8'; 
     6SET standard_conforming_strings = off; 
     7SET check_function_bodies = false; 
     8SET client_min_messages = warning; 
     9SET escape_string_warning = off; 
     10 
     11-- 
     12-- Name: moodle; Type: DATABASE; Schema: -; Owner: moodle 
     13-- 
     14 
     15CREATE DATABASE moodle WITH TEMPLATE = template0 ENCODING = 'UTF8'; 
     16 
     17 
     18ALTER DATABASE moodle OWNER TO moodle; 
     19 
     20\connect moodle 
    421 
    522SET client_encoding = 'UTF8'; 
    … …  
    14781495-- 
    14791496 
    1480 SELECT pg_catalog.setval('mdl_capabilities_id_seq', 285, true); 
     1497SELECT pg_catalog.setval('mdl_capabilities_id_seq', 286, true); 
    14811498 
    14821499 
    … …  
    18471864-- 
    18481865 
    1849 SELECT pg_catalog.setval('mdl_config_id_seq', 446, true); 
     1866SELECT pg_catalog.setval('mdl_config_id_seq', 453, true); 
    18501867 
    18511868 
    … …  
    18951912-- 
    18961913 
    1897 SELECT pg_catalog.setval('mdl_config_plugins_id_seq', 143, true); 
     1914SELECT pg_catalog.setval('mdl_config_plugins_id_seq', 144, true); 
    18981915 
    18991916 
    … …  
    24522469    defaultsortdir smallint DEFAULT 0 NOT NULL, 
    24532470    editany smallint DEFAULT 0 NOT NULL, 
    2454     notification bigint 
     2471    notification bigint DEFAULT 0 NOT NULL 
    24552472); 
    24562473 
    … …  
    69336950-- 
    69346951 
    6935 SELECT pg_catalog.setval('mdl_log_id_seq', 7, true); 
     6952SELECT pg_catalog.setval('mdl_log_id_seq', 10, true); 
    69366953 
    69376954 
    … …  
    70897106 
    70907107SELECT pg_catalog.setval('mdl_message_read_id_seq', 1, false); 
     7108 
     7109 
     7110-- 
     7111-- Name: mdl_mindmap; Type: TABLE; Schema: public; Owner: moodle; Tablespace:  
     7112-- 
     7113 
     7114CREATE TABLE mdl_mindmap ( 
     7115    id bigint NOT NULL, 
     7116    course bigint DEFAULT 0 NOT NULL, 
     7117    name character varying(255) DEFAULT ''::character varying NOT NULL, 
     7118    intro text, 
     7119    introformat smallint DEFAULT 0 NOT NULL, 
     7120    userid bigint NOT NULL, 
     7121    editable smallint NOT NULL, 
     7122    xmldata text NOT NULL, 
     7123    timecreated bigint DEFAULT 0 NOT NULL, 
     7124    timemodified bigint DEFAULT 0 NOT NULL 
     7125); 
     7126 
     7127 
     7128ALTER TABLE public.mdl_mindmap OWNER TO moodle; 
     7129 
     7130-- 
     7131-- Name: TABLE mdl_mindmap; Type: COMMENT; Schema: public; Owner: moodle 
     7132-- 
     7133 
     7134COMMENT ON TABLE mdl_mindmap IS 'Table for Moodle-Mindmaps'; 
     7135 
     7136 
     7137-- 
     7138-- Name: mdl_mindmap_id_seq; Type: SEQUENCE; Schema: public; Owner: moodle 
     7139-- 
     7140 
     7141CREATE SEQUENCE mdl_mindmap_id_seq 
     7142    START WITH 1 
     7143    INCREMENT BY 1 
     7144    NO MAXVALUE 
     7145    NO MINVALUE 
     7146    CACHE 1; 
     7147 
     7148 
     7149ALTER TABLE public.mdl_mindmap_id_seq OWNER TO moodle; 
     7150 
     7151-- 
     7152-- Name: mdl_mindmap_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: moodle 
     7153-- 
     7154 
     7155ALTER SEQUENCE mdl_mindmap_id_seq OWNED BY mdl_mindmap.id; 
     7156 
     7157 
     7158-- 
     7159-- Name: mdl_mindmap_id_seq; Type: SEQUENCE SET; Schema: public; Owner: moodle 
     7160-- 
     7161 
     7162SELECT pg_catalog.setval('mdl_mindmap_id_seq', 1, false); 
    70917163 
    70927164 
    … …  
    72667338    public_key_expires bigint DEFAULT 0 NOT NULL, 
    72677339    transport smallint DEFAULT 0 NOT NULL, 
    7268     portno smallint DEFAULT 0 NOT NULL, 
    72697340    last_connect_time bigint DEFAULT 0 NOT NULL, 
    72707341    last_log_id bigint DEFAULT 0 NOT NULL, 
    72717342    force_theme smallint DEFAULT 0 NOT NULL, 
    72727343    theme character varying(100), 
    7273     applicationid bigint DEFAULT 1 NOT NULL 
     7344    applicationid bigint DEFAULT 1 NOT NULL, 
     7345    portno integer DEFAULT 0 NOT NULL 
    72747346); 
    72757347 
    … …  
    77187790-- 
    77197791 
    7720 SELECT pg_catalog.setval('mdl_modules_id_seq', 22, true); 
     7792SELECT pg_catalog.setval('mdl_modules_id_seq', 23, true); 
    77217793 
    77227794 
    … …  
    1029310365-- 
    1029410366 
    10295 SELECT pg_catalog.setval('mdl_role_capabilities_id_seq', 719, true); 
     10367SELECT pg_catalog.setval('mdl_role_capabilities_id_seq', 720, true); 
    1029610368 
    1029710369 
    … …  
    1445114523-- 
    1445214524 
     14525ALTER TABLE mdl_mindmap ALTER COLUMN id SET DEFAULT nextval('mdl_mindmap_id_seq'::regclass); 
     14526 
     14527 
     14528-- 
     14529-- Name: id; Type: DEFAULT; Schema: public; Owner: moodle 
     14530-- 
     14531 
    1445314532ALTER TABLE mdl_mnet_application ALTER COLUMN id SET DEFAULT nextval('mdl_mnet_application_id_seq'::regclass); 
    1445414533 
    … …  
    15382154611       activity_modules        2007101509      0       0       1       0 
    15383154622       admin   2007101509      0       0       1       0 
    15384 3       admin_alert     2009062602      0       0       1       1 
    15385154634       admin_bookmarks 2007101509      0       0       1       0 
    15386154645       admin_tree      2007101509      0       0       1       0 
    … …  
    153911546910      course_list     2007101509      0       0       1       0 
    153921547011      course_summary  2007101509      0       0       1       0 
    15393 12      exabis_eportfolio       2009051901      0       0       1       0 
    153941547113      feedback        2009050701      0       0       1       0 
    153951547214      glossary_random 2007101509      0       0       1       1 
    … …  
    154281550549      wiki_updated    2004081200      0       0       1       0 
    154291550650      wiki_wanted     2004081200      0       0       1       0 
    15430 21      mrbs    2009061900      300     1266597902      1       0 
    15431 28      rss_client      2007101511      300     1266597902      1       1 
     1550721      mrbs    2009061900      300     1310133902      1       0 
     1550828      rss_client      2007101511      300     1310133901      1       1 
     155093       admin_alert     2010052401      0       0       1       1 
     1551012      exabis_eportfolio       2009121801      0       0       1       0 
    1543215511\. 
    1543315512 
    … …  
    1557215651 
    1557315652COPY mdl_cache_flags (id, flagtype, name, timemodified, value, expiry) FROM stdin; 
    15574 1       accesslib/dirtycontexts /1      1266595451      1       1266602651 
    1557515653\. 
    1557615654 
    … …  
    1587415952284     report/security:view    read    10      report/security 2 
    1587515953285     report/unittest:view    read    10      report/unittest 32 
     15954286     moodle/restore:createuser       write   10      moodle  24 
    1587615955\. 
    1587715956 
    … …  
    159731605254      filter_mediaplugin_enable_rm    1 
    159741605355      filter_mediaplugin_enable_youtube       0 
    15975 56      filter_tex_latexpreamble         \\usepackage[latin1]{inputenc}\n \\usepackage{amsmath}\n \\usepackage{amsfonts}\n \\RequirePackage{amsmath,amssymb,latexsym}\n 
    159761605457      filter_tex_latexbackground      #FFFFFF 
    159771605558      filter_tex_density      120 
    … …  
    159991607791      cookiesecure    0 
    160001607892      cookiehttponly  0 
    16001 93      regenloginsession       0 
    160021607994      excludeoldflashclients  10.0.12 
    160031608095      restrictmodulesfor      none 
    … …  
    160541613132      autolang        0 
    16055161323       auth    ldap 
     1613356      filter_tex_latexpreamble        \\usepackage[latin1]{inputenc}\n\\usepackage{amsmath}\n\\usepackage{amsfonts}\n\\RequirePackage{amsmath,amssymb,latexsym}\n 
    1605616134126     emoticons       :-){:}smiley{;}:){:}smiley{;}:-D{:}biggrin{;};-){:}wink{;}:-/{:}mixed{;}V-.{:}thoughtful{;}:-P{:}tongueout{;}B-){:}cool{;}^-){:}approve{;}8-){:}wideeyes{;}:o){:}clown{;}:-({:}sad{;}:({:}sad{;}8-.{:}shy{;}:-I{:}blush{;}:-X{:}kiss{;}8-o{:}surprise{;}P-|{:}blackeye{;}8-[{:}angry{;}xx-P{:}dead{;}|-.{:}sleepy{;}}-]{:}evil{;}(h){:}heart{;}(heart){:}heart{;}(y){:}yes{;}(n){:}no{;}(martin){:}martin{;}( ){:}egg 
    1605716135127     formatstringstriptags   1 
    … …  
    1612716205197     mnet_localhost_id       1 
    1612816206198     mnet_all_hosts_id       2 
    16129 199     version 2007101570 
    16130 200     release 1.9.7+ (Build: 20091209) 
    1613116207201     assignment_type_online_version  2005042900 
    1613216208202     exercise_initialdisable 1 
    … …  
    1618716263257     enrol_paypal_version    2006092200 
    1618816264258     gradeexport_ods_version 2007092701 
     16265200     release 1.9.12+ (Build: 20110518) 
    1618916266259     gradeexport_txt_version 2007092700 
    1619016267260     gradeexport_xls_version 2007092700 
    … …  
    1620716284277     rolesactive     1 
    1620816285278     digestmailtimelast      1266595502 
    16209 279     forum_lastreadclean     1266595502 
    16210 280     scorm_updatetimelast    1266595502 
    16211 281     lastexpirynotify        20100219 
    1621216286282     guestroleid     6 
    1621316287283     creatornewroleid        3 
    … …  
    1631116385381     resource_websearch      http://google.com/ 
    1631216386382     resource_defaulturl     http:// 
     16387279     forum_lastreadclean     1310133902 
     16388281     lastexpirynotify        20110708 
    1631316389383     resource_secretphrase    
    16314 384     resource_allowlocalfiles        0 
    1631516390385     resource_popup   
    1631616391386     resource_popupresizable checked 
    … …  
    1637516450445     supportemail    wwwadmin@@@domainname@@ 
    1637616451446     registerauth     
     16452280     scorm_updatetimelast    1310133901 
     16453447     filter_mediaplugin_enable_ogv   1 
     16454448     filter_mediaplugin_enable_ogg   1 
     16455199     version 2007101591.03 
     16456449     grade_report_overview_showtotalsifcontainhidden 0 
     16457450     grade_report_user_showtotalsifcontainhidden     0 
     16458451     feedback_allowfullanonymous     0 
     16459452     filter_tex_convertformat        gif 
     16460453     regenloginsession       1 
    1637716461\. 
    1637816462 
    … …  
    1652616610142     auth/ldap       field_updateremote_address      0 
    1652716611143     auth/ldap       field_lock_address      unlocked 
     16612144     scorm   grademethodfixed        1 
    1652816613\. 
    1652916614 
    … …  
    1656016645 
    1656116646COPY mdl_course (id, category, sortorder, password, fullname, shortname, idnumber, summary, format, showgrades, modinfo, newsitems, teacher, teachers, student, students, guest, startdate, enrolperiod, numsections, marker, maxbytes, showreports, visible, hiddensections, groupmode, groupmodeforce, defaultgroupingid, lang, theme, cost, currency, timecreated, timemodified, metacourse, requested, restrictmodules, expirynotify, expirythreshold, notifystudents, enrollable, enrolstartdate, enrolenddate, enrol, defaultrole) FROM stdin; 
    16562 1       0       0               @@schoolname@@ @@location@@     @@schoolname@@                  site    1       a:0:{}  3       Teacher Teachers        Student Students        0       0       0       0       0       0       0       1       0       0       0       0                               USD     0       1266595738      0       0       0       0       0       0       1       0       0               0 
     166471       0       1000            @@schoolname@@ @@location@@     @@schoolname@@                  site    1       a:0:{}  3       Teacher Teachers        Student Students        0       0       0       0       0       0       0       1       0       0       0       0                               USD     0       1266595738      0       0       0       0       0       0       1       0       0               0 
    1656316648\. 
    1656416649 
    … …  
    1727317358 
    1727417359COPY mdl_log (id, "time", userid, ip, course, module, cmid, action, url, info) FROM stdin; 
    17275 1       1266595683      2       10.16.1.10      1       user    0       update  view.php?id=2&course=1   
    17276 2       1266595739      2       10.16.1.10      1       course  0       view    view.php?id=1   1 
    17277 3       1266595783      2       10.16.1.10      1       user    0       logout  view.php?id=2&course=1  2 
    17278 4       1266595797      2       10.16.1.10      1       user    0       login   view.php?id=0&course=1  2 
    17279 5       1266595797      2       10.16.1.10      1       course  0       view    view.php?id=1   1 
    17280 6       1266596581      2       10.16.1.10      1       user    0       view    view.php?id=2&course=1  2 
    17281 7       1266596615      2       10.16.1.10      1       user    0       logout  view.php?id=2&course=1  2 
    1728217360\. 
    1728317361 
    … …  
    1745017528 
    1745117529-- 
     17530-- Data for Name: mdl_mindmap; Type: TABLE DATA; Schema: public; Owner: moodle 
     17531-- 
     17532 
     17533COPY mdl_mindmap (id, course, name, intro, introformat, userid, editable, xmldata, timecreated, timemodified) FROM stdin; 
     17534\. 
     17535 
     17536 
     17537-- 
    1745217538-- Data for Name: mdl_mnet_application; Type: TABLE DATA; Schema: public; Owner: moodle 
    1745317539-- 
    … …  
    1747917565-- 
    1748017566 
    17481 COPY mdl_mnet_host (id, deleted, wwwroot, ip_address, name, public_key, public_key_expires, transport, portno, last_connect_time, last_log_id, force_theme, theme, applicationid) FROM stdin; 
    17482 1       0       /moodle 10.16.1.1                       0       0       0       0       0       0       \N      1 
    17483 2       0                       All Hosts               0       0       0       0       0       0       \N      1 
     17567COPY mdl_mnet_host (id, deleted, wwwroot, ip_address, name, public_key, public_key_expires, transport, last_connect_time, last_log_id, force_theme, theme, applicationid, portno) FROM stdin; 
     175681       0       /moodle 10.16.1.1                       0       0       0       0       0       \N      1       0 
     175692       0                       All Hosts               0       0       0       0       0       \N      1       0 
    1748417570\. 
    1748517571 
    … …  
    1750617592 
    1750717593COPY mdl_mnet_rpc (id, function_name, xmlrpc_path, parent_type, parent, enabled, help, profile) FROM stdin; 
    17508 7       update_enrolments       auth/mnet/auth.php/update_enrolments    auth    mnet    0       Invoke this function _on_ the IDP to update it with enrolment info local to \\n the SP right after calling user_authorise() \\n \\n Normally called by the SP after calling     a:3:{i:0;a:2:{s:4:"type";s:7:"boolean";s:11:"description";N;}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:23:"username - The username";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:77:"courses - Assoc array of courses following the structure of mnet_enrol_course";}} 
     175941       user_authorise  auth/mnet/auth.php/user_authorise       auth    mnet    0       Return user data for the provided token, compare with user_agent string.        a:3:{i:0;a:2:{s:4:"type";s:5:"array";s:11:"description";s:44:"$userdata Array of user info for remote host";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:45:"token - The unique ID provided by remotehost.";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:30:"useragent - User Agent string.";}} 
     175952       keepalive_server        auth/mnet/auth.php/keepalive_server     auth    mnet    0       Receives an array of usernames from a remote machine and prods their\\n sessions to keep them alive     a:2:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:30:"\\"All ok\\" or an error message";}i:1;a:2:{s:4:"type";s:5:"array";s:11:"description";s:29:"array - An array of usernames";}} 
     175963       kill_children   auth/mnet/auth.php/kill_children        auth    mnet    0       The IdP uses this function to kill child sessions on other hosts        a:3:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:39:"A plaintext report of what has happened";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:39:"username - Username for session to kill";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:47:"useragent - SHA1 hash of user agent to look for";}} 
     175974       refresh_log     auth/mnet/auth.php/refresh_log  auth    mnet    0       Receives an array of log entries from an SP and adds them to the mnet_log\\n table      a:2:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:30:"\\"All ok\\" or an error message";}i:1;a:2:{s:4:"type";s:5:"array";s:11:"description";s:29:"array - An array of usernames";}} 
     175985       fetch_user_image        auth/mnet/auth.php/fetch_user_image     auth    mnet    0       Returns the user's image as a base64 encoded string.    a:2:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:17:"The encoded image";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:29:"username - The id of the user";}} 
     175996       fetch_theme_info        auth/mnet/auth.php/fetch_theme_info     auth    mnet    0       Returns the theme information and logo url as strings.  a:1:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:14:"The theme info";}} 
     176007       update_enrolments       auth/mnet/auth.php/update_enrolments    auth    mnet    0       Invoke this function _on_ the IDP to update it with enrolment info local to\\n the SP right after calling user_authorise()\\n \\n Normally called by the SP after calling       a:3:{i:0;a:2:{s:4:"type";s:7:"boolean";s:11:"description";N;}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:23:"username - The username";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:77:"courses - Assoc array of courses following the structure of mnet_enrol_course";}} 
     176018       keepalive_client        auth/mnet/auth.php/keepalive_client     auth    mnet    0       Poll the IdP server to let it know that a user it has authenticated is still\\n online  a:1:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";N;}} 
     176029       kill_child      auth/mnet/auth.php/kill_child   auth    mnet    0       TODO:Untested When the IdP requests that child sessions are terminated,\\n this function will be called on each of the child hosts. The machine that\\n calls the function (over xmlrpc) provides us with the mnethostid we need.       a:3:{i:0;a:2:{s:4:"type";s:7:"boolean";s:11:"description";s:15:"True on success";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:39:"username - Username for session to kill";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:47:"useragent - SHA1 hash of user agent to look for";}} 
     1760310      available_courses       enrol/mnet/enrol.php/available_courses  enrol   mnet    0       Does Foo        a:1:{i:0;a:2:{s:4:"type";s:7:"boolean";s:11:"description";s:47:"Whether the user can login from the remote host";}} 
     1760411      user_enrolments enrol/mnet/enrol.php/user_enrolments    enrol   mnet    0       No description given.   a:2:{i:0;a:2:{s:4:"type";s:4:"void";s:11:"description";s:0:"";}i:1;s:6:"userid";} 
    175091760512      enrol_user      enrol/mnet/enrol.php/enrol_user enrol   mnet    0       Enrols user to course with the default role     a:3:{i:0;a:2:{s:4:"type";s:7:"boolean";s:11:"description";s:41:"Whether the enrolment has been successful";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:37:"user - The username of the remote use";}i:2;a:2:{s:4:"type";s:3:"int";s:11:"description";s:37:"courseid - The id of the local course";}} 
    175101760613      unenrol_user    enrol/mnet/enrol.php/unenrol_user       enrol   mnet    0       Unenrol a user from a course    a:3:{i:0;a:2:{s:4:"type";s:7:"boolean";s:11:"description";s:47:"Whether the user can login from the remote host";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:23:"username - The username";}i:2;a:2:{s:4:"type";s:3:"int";s:11:"description";s:37:"courseid - The id of the local course";}} 
    175111760714      course_enrolments       enrol/mnet/enrol.php/course_enrolments  enrol   mnet    0       Get a list of users from the client server who are enrolled in a course a:3:{i:0;a:2:{s:4:"type";s:5:"array";s:11:"description";s:39:"Array of usernames who are homed on the";}i:1;a:2:{s:4:"type";s:3:"int";s:11:"description";s:24:"courseid - The Course ID";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:47:"roles - Comma-separated list of role shortnames";}} 
    17512 1       user_authorise  auth/mnet/auth.php/user_authorise       auth    mnet    0       Return user data for the provided token, compare with user_agent string.        a:3:{i:0;a:2:{s:4:"type";s:5:"array";s:11:"description";s:44:"$userdata Array of user info for remote host";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:45:"token - The unique ID provided by remotehost.";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:30:"useragent - User Agent string.";}} 
    17513 2       keepalive_server        auth/mnet/auth.php/keepalive_server     auth    mnet    0       Receives an array of usernames from a remote machine and prods their \\n sessions to keep them alive    a:2:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:30:""All ok" or an error message";}i:1;a:2:{s:4:"type";s:5:"array";s:11:"description";s:29:"array - An array of usernames";}} 
    17514 3       kill_children   auth/mnet/auth.php/kill_children        auth    mnet    0       The IdP uses this function to kill child sessions on other hosts        a:3:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:39:"A plaintext report of what has happened";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:39:"username - Username for session to kill";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:47:"useragent - SHA1 hash of user agent to look for";}} 
    17515 4       refresh_log     auth/mnet/auth.php/refresh_log  auth    mnet    0       Receives an array of log entries from an SP and adds them to the mnet_log \\n table     a:2:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:30:""All ok" or an error message";}i:1;a:2:{s:4:"type";s:5:"array";s:11:"description";s:29:"array - An array of usernames";}} 
    17516 5       fetch_user_image        auth/mnet/auth.php/fetch_user_image     auth    mnet    0       Returns the user's image as a base64 encoded string.    a:2:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:17:"The encoded image";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:29:"username - The id of the user";}} 
    17517 6       fetch_theme_info        auth/mnet/auth.php/fetch_theme_info     auth    mnet    0       Returns the theme information and logo url as strings.  a:1:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";s:14:"The theme info";}} 
    17518 8       keepalive_client        auth/mnet/auth.php/keepalive_client     auth    mnet    0       Poll the IdP server to let it know that a user it has authenticated is still \\n online a:1:{i:0;a:2:{s:4:"type";s:6:"string";s:11:"description";N;}} 
    17519 9       kill_child      auth/mnet/auth.php/kill_child   auth    mnet    0       TODO:Untested When the IdP requests that child sessions are terminated, \\n this function will be called on each of the child hosts. The machine that \\n calls the function (over xmlrpc) provides us with the mnethostid we need.     a:3:{i:0;a:2:{s:4:"type";s:7:"boolean";s:11:"description";s:15:"True on success";}i:1;a:2:{s:4:"type";s:6:"string";s:11:"description";s:39:"username - Username for session to kill";}i:2;a:2:{s:4:"type";s:6:"string";s:11:"description";s:47:"useragent - SHA1 hash of user agent to look for";}} 
    17520 10      available_courses       enrol/mnet/enrol.php/available_courses  enrol   mnet    0       Does Foo        a:1:{i:0;a:2:{s:4:"type";s:7:"boolean";s:11:"description";s:47:"Whether the user can login from the remote host";}} 
    17521 11      user_enrolments enrol/mnet/enrol.php/user_enrolments    enrol   mnet    0       No description given.   a:2:{i:0;a:2:{s:4:"type";s:4:"void";s:11:"description";s:0:"";}i:1;s:6:"userid";} 
    1752217608\. 
    1752317609 
    … …  
    17579176652       book    2008081402      0       0               1 
    17580176664       choice  2007101509      0       0               1 
    17581 5       data    2007101514      60      0               1 
    17582176676       exercise        2007110500      60      0               0 
    17583 7       feedback        2008050120      0       0               1 
    17584176689       glossary        2007101509      0       0               1 
    175851766910      hotpot  2007101513      0       0               0 
    … …  
    175891767314      lesson  2008112601      0       0               1 
    175901767416      quiz    2007101511      0       0               1 
    17591 17      resource        2007101510      0       0               1 
    175921767519      survey  2007101509      0       0               1 
    175931767620      webquest        2007081222      0       0               1 
    17594 21      wiki    2009012201      0       0               1 
    175951767722      workshop        2007101510      60      0               0 
    17596 15      questionnaire   2008060405      43200   1266595502              1 
    17597 3       chat    2009031100      300     1266597902              1 
    17598 18      scorm   2007110502      300     1266597902              1 
    17599 1       assignment      2007101511      60      1266598202              1 
    17600 8       forum   2007101513      60      1266598202              1 
     1767815      questionnaire   2008060405      43200   1310133901              1 
     176793       chat    2009031100      300     1310133901              1 
     176801       assignment      2007101511      60      1310133901              1 
     176818       forum   2007101513      60      1310133901              1 
     176825       data    2007101515      60      0               1 
     176837       feedback        2008050125      0       0               1 
     1768423      mindmap 20080622        0       0               1 
     1768517      resource        2007101511      0       0               1 
     1768618      scorm   2007110503      300     1310133901              1 
     1768721      wiki    2010052800      0       0               1 
    1760117688\. 
    1760217689 
    … …  
    1875718844718     1       1       report/security:view    1       1266595447      0 
    1875818845719     1       1       report/unittest:view    1       1266595447      0 
     18846720     1       1       moodle/restore:createuser       1       1310133933      2 
    1875918847\. 
    1876018848 
    … …  
    2037220460 
    2037320461-- 
     20462-- Name: mdl_mind_id_pk; Type: CONSTRAINT; Schema: public; Owner: moodle; Tablespace:  
     20463-- 
     20464 
     20465ALTER TABLE ONLY mdl_mindmap 
     20466    ADD CONSTRAINT mdl_mind_id_pk PRIMARY KEY (id); 
     20467 
     20468 
     20469-- 
    2037420470-- Name: mdl_mnetappl_id_pk; Type: CONSTRAINT; Schema: public; Owner: moodle; Tablespace:  
    2037520471-- 
    … …  
    2318923285 
    2319023286-- 
     23287-- Name: mdl_mind_cou_ix; Type: INDEX; Schema: public; Owner: moodle; Tablespace:  
     23288-- 
     23289 
     23290CREATE INDEX mdl_mind_cou_ix ON mdl_mindmap USING btree (course); 
     23291 
     23292 
     23293-- 
     23294-- Name: mdl_mind_use_ix; Type: INDEX; Schema: public; Owner: moodle; Tablespace:  
     23295-- 
     23296 
     23297CREATE INDEX mdl_mind_use_ix ON mdl_mindmap USING btree (userid); 
     23298 
     23299 
     23300-- 
    2319123301-- Name: mdl_mnetenroassi_hoscou_ix; Type: INDEX; Schema: public; Owner: moodle; Tablespace:  
    2319223302-- 
    … …  
    2437624486 
    2437724487CREATE UNIQUE INDEX mdl_user_mneuse_uix ON mdl_user USING btree (mnethostid, username); 
     24488 
     24489 
     24490-- 
     24491-- Name: mdl_userinfodata_usefie_ix; Type: INDEX; Schema: public; Owner: moodle; Tablespace:  
     24492-- 
     24493 
     24494CREATE INDEX mdl_userinfodata_usefie_ix ON mdl_user_info_data USING btree (userid, fieldid); 
    2437824495 
    2437924496 

  • main/linuxmuster-base/branches/testing/var/config-dynamic/22_nagios/prepatch

    r787 r1206  
    1616/etc/init.d/nagios3 start 
    1717 
     18# nagios fernueberwachung, reconfigure in case of domainname change 
     19if [ "$domainname" != "$domainname_old" ]; then 
     20 dpkg -l | grep linuxmuster-nagios-fernueberwachung | grep -q ^i && dpkg-reconfigure linuxmuster-nagios-fernueberwachung 
     21fi 
     22 

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

    • Property svn:keywords changed from Id to Id Revision
    r787 r1206  
     1# $Id$ 
     2# 
    13# check if imaging method is linbo  
     4 
    25if  [ "$imaging" = "linbo" ]; then 
    36 
    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 
    622 
    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 
    1330 
    14                 # provide empty workstations data 
    15                 rm -rf $SYSCONFDIR/workstations 
     31 # stuff to do on first time install 
     32 if [ "$1" = "--first" ]; then 
    1633 
    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 
    1841 
    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 
    2744 
    28         fi 
     45 else # modify 
    2946 
    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 
    3156 
    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 
    3558 
    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 
    4360 
    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 
    4964 
    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 
    5372 
    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 
    5676 
    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 
    6379 
    64         # open internal firewall for multicasting and rsync 
    65         . /etc/default/linuxmuster-linbo 
    66         if ! grep ^udp $ALLOWEDPORTS | grep -q $PORTBASE:; then 
    67                 backup_file $ALLOWEDPORTS 
    68                 PORTMAX=$PORTBASE 
    69                 let PORTMAX+=100 
    70                 PORTS=`grep ^udp $ALLOWEDPORTS | awk '{ print $2 }'` 
    71                 PORTS="$PORTS,$PORTBASE:$PORTMAX" 
    72                 sed -e "s/^udp.*/udp $PORTS/" -i $ALLOWEDPORTS 
    73         fi 
    74         if ! grep ^tcp $BASEPORTS | grep -qw rsync; then 
    75                 backup_file $BASEPORTS 
    76                 PORTS=`grep ^tcp $BASEPORTS | awk '{ print $2 }'` 
    77                 PORTS="$PORTS,rsync" 
    78                 sed -e "s/^tcp.*/tcp $PORTS/" -i $BASEPORTS 
    79         fi 
     80 # 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 
    8096 
    81         # patch start.confs with serverip 
    82         for i in $LINBODEFAULTCONF `find $LINBODIR/ -type f -name 'start.conf*'`; do 
    83                 backup_file $i 
    84                 sed -e "s/^Server = \([0-9]\{1,3\}[.]\)\{3\}[0-9]\{1,3\}/Server = $serverip/" -i $i 
    85         done 
     97 # 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 
    86102 
    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 
    92109 
    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 
    99113 
    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 
    103123 
    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 
    113134 
    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\ 
     139linbo: \"\|\/usr\/share\/linuxmuster-linbo\/mail2log.sh\"" -i /etc/aliases 
     140  newaliases 
     141 fi 
    124142 
    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 
    132146 
    133         # change owner of logdir to nobody 
    134         [ -d "$LOGDIR/linbo" ] || mkdir -p $LOGDIR/linbo 
    135         chown nobody $LOGDIR/linbo 
    136  
    137         # start necessary services 
    138         /etc/init.d/atftpd start 
    139         /etc/init.d/rsync start 
     147 # start necessary services 
     148 /etc/init.d/tftpd-hpa start 
     149 /etc/init.d/rsync start 
    140150        # don't start these on first install 
    141151        if [ "$1" != "--first" ]; then 
    … …  
    149159        fi 
    150160 
    151 else 
     161 # don't start these on first install 
     162 if [ "$1" != "--first" ]; then 
     163  /etc/init.d/bittorrent start 
     164  /etc/init.d/linbo-bittorrent start 
     165  /etc/init.d/linbo-multicast start 
     166 else 
     167  [ -e /etc/default/bittorrent ] && sed -e 's|^START_BTTRACK=.*|START_BTTRACK=0|' -i /etc/default/bittorrent 
     168  [ -e /etc/default/linbo-bittorrent ] && sed -e 's|^START_BITTORRENT=.*|START_BITTORRENT=0|' -i /etc/default/linbo-bittorrent 
     169  [ -e /etc/default/linuxmuster-linbo ] && sed -e 's|^START_MULTICAST=.*|START_MULTICAST=no|' -i /etc/default/linuxmuster-linbo 
     170 fi 
    152171 
    153         # patch start variables of atftpd and rsync 
    154         [ -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/rsync 
    156         [ -e /etc/default/linuxmuster-linbo ] && backup_file /etc/default/linuxmuster-linbo ; sed -e "s/^START_MULTICAST=.*/START_MULTICAST=no/" -i /etc/default/linuxmuster-linbo 
     172else # switch to rembo, deactivate linbo 
    157173 
    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 
     174 # patch start variables of tftpd-hpa and rsync 
     175 [ -e /etc/default/tftpd-hpa ] && backup_file /etc/default/tftpd-hpa ; sed -e "s/^RUN_DAEMON=.*/RUN_DAEMON=no/" -i /etc/default/tftpd-hpa 
     176 [ -e /etc/default/rsync ] && backup_file /etc/default/rsync ; sed -e "s/^RSYNC_ENABLE=.*/RSYNC_ENABLE=false/" -i /etc/default/rsync 
     177 [ -e /etc/default/linuxmuster-linbo ] && backup_file /etc/default/linuxmuster-linbo ; sed -e "s/^START_MULTICAST=.*/START_MULTICAST=no/" -i /etc/default/linuxmuster-linbo 
    164178 
    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 
     179 # remove linbo mail wrapper from /etc/aliases 
     180 if grep -q ^linbo: /etc/aliases; then 
     181  backup_file /etc/aliases 
     182  grep -v ^linbo: /etc/aliases > /var/tmp/aliases 
     183  mv /var/tmp/aliases /etc/aliases 
     184  newaliases 
     185 fi 
    172186 
    173187fi 

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

    r787 r1206  
    8686                let o+=1 
    8787        done 
     88        rm -f $LINBODIR/*.torrent 
    8889        import_workstations 
    8990        wsimport=yes 

  • main/linuxmuster-base/branches/testing/var/config-static/etc/samba/smb.conf.shares

    • Property svn:keywords changed from Id to Id Revision
    r787 r1206  
    1 # custom share definitions  
     1# custom share definitions 
     2# $Id$ 
    23 
    3 # A sample share for sharing your CD-ROM with others. 
    4 ;[cdrom] 
    5 ;   comment = Samba server's CD-ROM 
    6 ;   writable = no 
    7 ;   locking = no 
    8 ;   path = /cdrom 
    9 ;   public = yes 
     4# program share with write permissions 
     5;[pgmw] 
     6;   comment = Windows Programs with write perms 
     7;   path = /home/samba/pgmw 
     8;   admin users = @domadmins 
     9;   writeable = Yes 
     10;   guest ok = No 
    1011 
    11 # The next two parameters show how to auto-mount a CD-ROM when the 
    12 #       cdrom share is accesed. For this to work /etc/fstab must contain 
    13 #       an entry like this: 
    14 # 
    15 #       /dev/scd0   /cdrom  iso9660 defaults,noauto,ro,user   0 0 
    16 # 
    17 # The CD-ROM gets unmounted automatically after the connection to the 
    18 # 
    19 # If you don't want to use auto-mounting/unmounting make sure the CD 
    20 #       is mounted on /cdrom 
    21 # 
    22 ;   preexec = /bin/mount /cdrom 
    23 ;   postexec = /bin/umount /cdrom 
     12# add your own shares here 
    2413 
Note: See TracChangeset for help on using the changeset viewer.