Changeset 1167

Show
Ignore:
Timestamp:
08/20/08 22:56:20 (3 months ago)
Author:
shibuya
Message:

- modified configration files for pwdb to shadow.
- migrate from pwdb to shadow.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 5100R/trunk/ui/base-bluequartz.mod/Makefile

    r1072 r1167  
    77SERVICE=bluequartz 
    88 
    9 BUILD=20080128 
     9BUILD=20080820 
    1010 
    1111VERSION=5100R 
    12 RELEASE=1.$(BUILD)BQ80 
     12RELEASE=2.$(BUILD)BQ81 
    1313 
    1414# add a buildarch if desired 
    …… 
    2424 
    2525REQUIRES=httpd php iptables base-alpine-capstone /sbin/chkconfig swatch sendmail-cf m4 cyrus-sasl 
    26 REQUIRES_GLUE=base-email-capstone base-time-capstone >= 1.0.1-62BQ11 
     26REQUIRES_GLUE=base-email-capstone base-time-capstone >= 1.0.1-62BQ11 base-user-capstone >= 1.2.0-0BQ1 base-user-glue >= 1.2.0-0BQ1 at 
    2727 
    2828include /usr/sausalito/devel/module.mk 

  • 5100R/trunk/ui/base-bluequartz.mod/glue/Makefile

    r1030 r1167  
    1 BUILD=20071210 
     1BUILD=20080820 
    22PRODUCT=$(shell \ 
    33if [ -f /etc/fedora-release ] && [ "`rpm -q --qf=%{version} fedora-release`" = "1" ]; then echo '5100'; fi; \ 
    …… 
    1717install: 
    1818        mkdir -p $(PREFIX)/etc 
    19         mkdir -p $(PREFIX)/etc/rc.d/init.d 
    20         mkdir -p $(PREFIX)/etc/logrotate.d 
    2119        mkdir -p $(PREFIX)/etc/locks 
     20        mkdir -p $(PREFIX)/etc/sysconfig 
    2221        mkdir -p $(PREFIX)/usr/sausalito/sbin 
    2322        mkdir -p $(PREFIX)/usr/sausalito/scripts 

  • 5100R/trunk/ui/base-bluequartz.mod/glue/scripts/initSendmail.sh

    r790 r1167  
    66    mv /etc/mail/aliases.rpmsave /etc/mail/aliases 
    77  else 
    8     cp -p $CONFDIR/aliases /etc/mail/aliases 
     8    ln -s /etc/aliases /etc/mail/aliases 
     9  fi 
     10  grep '^root:' /etc/mail/aliases > /dev/null 2>&1 
     11  if [ $? = 1 ]; 
     12    echo 'root:         admin' >> /etc/mail/aliases 
    913  fi 
    1014  /usr/sbin/makemap hash /etc/mail/aliases.db < /etc/mail/aliases 
    1115fi 
    1216cp -p $CONFDIR/sendmail.mc /etc/mail/sendmail.mc 
    13 cp -p $CONFDIR/sendmail.pam /etc/pam.d/smtp.sendmail 
    1417cp -p $CONFDIR/popauth.m4 /usr/share/sendmail-cf/hack/popauth.m4 
    1518 

  • 5100R/trunk/ui/base-bluequartz.mod/templates/rpmdefs.tmpl

    r1072 r1167  
    6666%dir /etc/locks 
    6767%config /etc/rc.d/init.d/* 
    68 %config /etc/logrotate.d/* 
    69 %config /etc/cron.d/* 
     68%config /etc/sysconfig/bluequartz 
    7069%attr(0755,root,root) /usr/sausalito/sbin/* 
    7170%attr(0755,root,root) /usr/sausalito/scripts/* 
    …… 
    144143/usr/sausalito/constructor/base/email/syncEmailService.pl 
    145144 
    146 # Register the dbrecover service 
    147 /sbin/chkconfig --add dbrecover 
    148145/sbin/chkconfig --add bluequartz 
    149146 
    …… 
    163160perl -pi -e 's|gpgcheck=0|gpgcheck=1|g' /etc/yum.repos.d/BlueQuartz-Base.repo 
    164161%endif 
     162 
     163# pwdb2shadow 
     164if [ -f /etc/sysconfig/bluequartz ]; then 
     165  . /etc/sysconfig/bluequartz 
     166fi 
     167 
     168if [ $AUTH == 'pwdb' ]; then 
     169  ln -sf /usr/sausalito/scripts/pwdb2shadow.sh /usr/sausalito/runonce/pwdb2shadow.sh 
     170  /usr/sausalito/scripts/pwdb2shadow.sh 
     171fi 
    165172 
    166173<end glue> 
    …… 
    219226    /bin/mv /etc/mail/aliases.rpmsave /etc/mail/aliases 
    220227  else 
    221     /bin/cp /usr/sausalito/configs/sendmail/aliases /etc/mail/aliases 
     228    /bin/ln -s /etc/aliases /etc/mail/aliases 
     229  fi 
     230  grep '^root:' /etc/mail/aliases > /dev/null 2>&1 
     231  if [ $? = 1 ]; then 
     232    echo 'root:         admin' >> /etc/mail/aliases 
    222233  fi 
    223234  /etc/init.d/sendmail condrestart 
    …… 
    227238    /usr/share/sendmail-cf/hack/popauth.m4 
    228239fi 
    229 /bin/cp /usr/sausalito/triggers/sendmail/smtp.sendmail /etc/pam.d/smtp.sendmail 
    230240 
    231241%triggerin glue -- glibc 
    …… 
    233243 
    234244# for distributions 
     245%if "%centos" == "5" 
     246/CentOS-Base.repo%triggerin glue -- iptables 
     247/bin/cp /usr/sausalito/triggers/iptables/iptables-CentOS5.init /etc/init.d/iptab 
     248les 
     249%triggerin glue -- initscripts 
     250/bin/cp /usr/sausalito/triggers/initscripts/ifup-CentOS5 /sbin/ifup 
     251%endif 
     252 
    235253%if "%centos" == "4" 
    236254%triggerin glue -- centos-yumconf 
    …… 
    274292    /bin/mv /etc/mail/aliases.rpmsave /etc/mail/aliases 
    275293  else 
    276     /bin/cp /usr/sausalito/configs/sendmail/aliases /etc/mail/aliases 
     294    /bin/ln -s /etc/aliases /etc/mail/aliases 
     295  fi 
     296  grep '^root:' /etc/mail/aliases > /dev/null 2>&1 
     297  if [ $? = 1 ]; 
     298    echo 'root:         admin' >> /etc/mail/aliases 
    277299  fi 
    278300  /etc/init.d/sendmail condrestart 
    …… 
    281303 
    282304<begin $CHANGELOG> 
     305* Wed Aug 20 2008 Hisao SHIBUYA <shibuya@bluequartz.org> 2.20080820BQ81 
     306- modified configration files for pwdb to shadow. 
     307- migrate from pwdb to shadow. 
     308 
    283309* Mon Jan 28 2008 Hisao SHIBUYA <shibuya@bluequartz.org> 1.20080128BQ80 
    284310- requires base-time-capstone >= 1.0.1-62BQ11 for triggerin.