[exim-cvs] cvs commit: exim/exim-course/rpm exim-course.spec

Αρχική Σελίδα
Delete this message
Reply to this message
Συντάκτης: Tony Finch
Ημερομηνία:  
Προς: exim-cvs
Αντικείμενο: [exim-cvs] cvs commit: exim/exim-course/rpm exim-course.spec
fanf2 2006/07/17 18:36:40 BST

  Modified files:
    exim-course/rpm      exim-course.spec 
  Log:
  deal with changes from pwfcfg2 to pwfcfg3


  Revision  Changes    Path
  1.10      +7 -5      exim/exim-course/rpm/exim-course.spec


  Index: exim-course.spec
  ===================================================================
  RCS file: /home/cvs/exim/exim-course/rpm/exim-course.spec,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- exim-course.spec    17 Jul 2006 16:32:15 -0000    1.9
  +++ exim-course.spec    17 Jul 2006 17:36:40 -0000    1.10
  @@ -1,4 +1,4 @@
  -# $Cambridge: exim/exim-course/rpm/exim-course.spec,v 1.9 2006/07/17 16:32:15 fanf2 Exp $
  +# $Cambridge: exim/exim-course/rpm/exim-course.spec,v 1.10 2006/07/17 17:36:40 fanf2 Exp $
   #
   # The RPM spec file for the package which customizes PWF Linux for the
   # Exim course. This is a little bit sketchy and assumes a working
  @@ -115,9 +115,10 @@
   openssl x509 -req -days 14 -in server.csr -passin pass:abc123 -signkey server.key -out server.crt
   # remove root from the aliases file that pwfcfg2 uses to reset the
   # machine's configuration at boot time
  -. /etc/pwf-linux/pwfcfg2
  -mv ${PWFCFG_LOC}/etc/aliases ${PWFCFG_LOC}/etc/aliases.orig
  -sed '/^root:/d' ${PWFCFG_LOC}/etc/aliases.orig > ${PWFCFG_LOC}/etc/aliases
  +ETC=/etc/pwfcfg3/pwfcfg3-aliases.d/etc
  +mv $ETC/aliases $ETC/aliases.orig
  +sed '/^root:/d;/^condor:/d' $ETC/aliases.orig > $ETC/aliases
  +cp $ETC/aliases /etc/aliases
   # turn on SpamAssassin and ClamAV
   chkconfig spamd on
   chkconfig clamd on
  @@ -137,8 +138,8 @@
   groupdel course
   groupdel exim
   # restore the aliases file
  -. /etc/pwf-linux/pwfcfg2
  -mv ${PWFCFG_LOC}/etc/aliases.orig ${PWFCFG_LOC}/etc/aliases
  +ETC=/etc/pwfcfg3/pwfcfg3-aliases.d/etc
  +mv $ETC/aliases.orig $ETC/aliases
   # turn off SpamAssassin and ClamAV
   chkconfig spamd off
   chkconfig clamd off
  @@ -150,6 +151,7 @@
   * Mon Jul 17 2006 - fanf@???
   - add smtpc
   - create TLS certificate and key
  +- deal with changes from pwfcfg2 to pwfcfg3
   * Fri Jul 01 2005 - fanf@???
   - add exim user
   - create eicar.com