Changeset 1048

Show
Ignore:
Timestamp:
01/01/08 02:21:20 (1 year ago)
Author:
shibuya
Message:

remove initSpool.sh to store the mail on homedir.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r964 r1048  
    77SERVICE=bluequartz 
    88 
    9 BUILD=20061012 
     9BUILD=20070624 
    1010 
    11 VERSION=5100R 
    12 RELEASE=1.$(BUILD)BQ75 
     11VERSION=5200R 
     12RELEASE=0.$(BUILD)BQ1 
    1313 
    1414# add a buildarch if desired 

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

    r964 r1048  
    1 BUILD=20061012 
     1BUILD=20070624 
    22PRODUCT=$(shell \ 
    3 if [ -f /etc/fedora-release ] && [ "`rpm -q --qf=%{version} fedora-release`" = "1" ]; then echo '5100'; fi; \ 
    4 if [ -f /etc/redhat-release ] && [ "`rpm -q --qf=%{version} centos-release`" = "3" ]; then echo '5101'; fi; \ 
    5 if [ -f /etc/redhat-release ] && [ "`rpm -q --qf=%{version} centos-release`" = "4" ]; then \ 
    6   if [ "`rpm -q --qf=%{arch} centos-release`" = "i386" ]; then echo '5102'; fi; \ 
    7   if [ "`rpm -q --qf=%{arch} centos-release`" = "x86_64" ]; then echo '5103'; fi; \ 
    8   if [ "`rpm -q --qf=%{arch} centos-release`" = "ppc" ]; then echo '5104'; fi; \ 
    9   if [ "`rpm -q --qf=%{arch} centos-release`" = "alpha" ]; then echo '5105'; fi; \ 
     3if [ -f /etc/redhat-release ] && [ "`rpm -q --qf=%{version} centos-release`" = "5" ]; then \ 
     4  if [ "`rpm -q --qf=%{arch} centos-release`" = "i386" ]; then echo '5200'; fi; \ 
     5  if [ "`rpm -q --qf=%{arch} centos-release`" = "x86_64" ]; then echo '5201'; fi; \ 
    106fi; \ 
    117) 
    …… 
    2319        mkdir -p $(PREFIX)/usr/sausalito/scripts 
    2420        mkdir -p $(PREFIX)/usr/sausalito/runonce 
    25         tar cBf - --exclude '*CVS*' etc | (cd $(PREFIX)/ ; tar xBf -) 
     21        tar cBf - --exclude '*CVS*' --exclude '.svn' etc | (cd $(PREFIX)/ ; tar xBf -) 
    2622        cat etc/build | sed -e 's/XX_BUILD_XX/$(BUILD)/' | \ 
    2723                        sed -e 's/XX_PRODUCT_XX/$(PRODUCT)/g' > $(PREFIX)/etc/build 
    28         tar cBf - --exclude '*CVS*' triggers | (cd $(PREFIX)/usr/sausalito/ ; tar xBf -) 
     24        tar cBf - --exclude '*CVS*' --exclude '.svn' triggers | (cd $(PREFIX)/usr/sausalito/ ; tar xBf -) 
    2925        mkdir -p $(PREFIX)/var/www/html 
    3026        install -m 0644 httpd/index.html $(PREFIX)/var/www/html/index.html 
    31         tar cBf - --exclude '*CVS*' sbin | (cd $(PREFIX)/usr/sausalito ; tar xBf -) 
    32         tar cBf - --exclude '*CVS*' scripts | (cd $(PREFIX)/usr/sausalito ; tar xBf -) 
    33         tar cBf - --exclude '*CVS*' configs | (cd $(PREFIX)/usr/sausalito ; tar xBf -) 
     27        tar cBf - --exclude '*CVS*' --exclude '.svn' sbin | (cd $(PREFIX)/usr/sausalito ; tar xBf -) 
     28        tar cBf - --exclude '*CVS*' --exclude '.svn' scripts | (cd $(PREFIX)/usr/sausalito ; tar xBf -) 
     29        tar cBf - --exclude '*CVS*' --exclude '.svn' configs | (cd $(PREFIX)/usr/sausalito ; tar xBf -) 

  • 5200R/trunk/ui/base-bluequartz.mod/glue/scripts/enableQuota.sh

    r697 r1048  
    33tmpfile='/etc/fstab.tmp' 
    44 
    5 grep '/home' /etc/fstab > /dev/null 2>&1 
     5grep '/home[[:blank:]]' /etc/fstab > /dev/null 2>&1 
    66if [ $? -eq 0 ]; 
    77then 

  • 5200R/trunk/ui/base-bluequartz.mod/glue/triggers/webalizer/webalizer.conf

    r698 r1048  
    5050# is relative to the output directory, unless absolute (leading /). 
    5151 
    52 HistoryName     webalizer.hist 
     52HistoryName     /var/lib/webalizer/webalizer.hist 
    5353 
    5454# Incremental processing allows multiple partial log files to be used 
    …… 
    7474# as 'yes' then this option has no meaning. 
    7575 
    76 IncrementalName webalizer.current 
     76IncrementalName /var/lib/webalizer/webalizer.current 
    7777 
    7878# ReportTitle is the text to display as the title.  The hostname 
    …… 
    108108PageType        htm* 
    109109PageType        cgi 
     110PageType        php 
     111PageType        shtml 
    110112#PageType       phtml 
    111113#PageType       php3 
    …… 
    230232 
    231233# FoldSeqErr forces the Webalizer to ignore sequence errors. 
    232 # This is useful for Netscape and other web servers that cache 
    233 # the writing of log records and do not guarentee that they 
    234 # will be in chronological order.  The use of the FoldSeqErr 
    235 # option will cause out of sequence log records to be treated 
    236 # as if they had the same time stamp as the last valid record. 
    237 # Default is to ignore out of sequence log records. 
    238  
    239 #FoldSeqErr     no 
     234# The Apache HTTP server may generate out-of-sequence log entries 
     235# so this option is enabled. 
     236 
     237FoldSeqErr      no 
    240238 
    241239# VisitTimeout allows you to set the default timeout for a visit 

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

    r964 r1048  
    3030[AUTOFILL] 
    3131[BUILDARCH] 
    32 %if "%fedora" == "1" 
    33 Requires: pwdb >= 0.61.1-9BQ7 nss_db >= 2.2-22BQ3 
    34 %endif 
    35 %if "%centos" == "3" 
    36 Requires: pwdb >= 0.61.1-9BQ8 nss_db >= 2.2-20.4BQ1 
    37 %endif 
    38 %if "%centos" == "4" 
    39 Requires: pwdb >= 0.61.1-9BQ8 nss_db >= 2.2-29BQ1 php-mbstring 
    40 %endif 
     32Requires: php-mbstring 
    4133 
    4234%description [LABEL] 
    …… 
    6658%dir /etc/locks 
    6759%config /etc/rc.d/init.d/* 
    68 %config /etc/logrotate.d/* 
    6960%config /etc/cron.d/* 
    7061%attr(0755,root,root) /usr/sausalito/sbin/* 
    …… 
    113104fi 
    114105 
    115 # update sendmail.cf 
    116 /bin/grep 'setup for Blue Quartz' /etc/mail/sendmail.mc > /dev/null 2>&1 
    117 if [ $? = 0 ]; then 
    118   /bin/mv /etc/mail/sendmail.mc /etc/mail/sendmail.mc.bqold 
    119   /bin/mv /etc/mail/sendmail.cf /etc/mail/sendmail.cf.bqold 
    120   /usr/sausalito/scripts/initSendmail.sh 
    121 fi 
    122  
    123 # update procmailrc 
    124 if [ ! -f /etc/procmailrc ]; then 
    125   /usr/sausalito/scripts/initProcmail.sh 
    126 else 
    127   grep '^ORGMAIL=$HOME/mbox' /etc/procmailrc > /dev/null 2>%1 
    128   if [ $? = 1 ]; then 
    129     echo 'ORGMAIL=$HOME/mbox' >> /etc/procmailrc 
    130   fi 
    131   grep '^DEFAULT=$ORGMAIL' /etc/procmailrc > /dev/null 2>%1 
    132   if [ $? = 1 ]; then 
    133     echo 'DEFAULT=$ORGMAIL' >> /etc/procmailrc 
    134   fi 
    135 fi 
    136  
    137 if [ -f /etc/sysconfig/saslauthd ]; then 
    138   /usr/bin/perl -pi -e 's|^MECH=shadow|MECH=pam|g'  /etc/sysconfig/saslauthd 
    139 else 
    140   echo 'MECH=pam' > /etc/sysconfig/saslauthd 
    141 fi 
     106# sync email services 
    142107/usr/sausalito/constructor/base/email/syncEmailService.pl 
    143108 
    144 # Register the dbrecover service 
    145 /sbin/chkconfig --add dbrecover 
     109# Register the bluequartz service 
    146110/sbin/chkconfig --add bluequartz 
    147111 
    …… 
    181145 
    182146%triggerin glue -- webalizer 
    183 %if "%fedora" == "1" 
    184 /bin/cp /usr/sausalito/triggers/webalizer/webalizer-fc1.conf /etc/webalizer.conf 
    185 %else 
    186147/bin/cp /usr/sausalito/triggers/webalizer/webalizer.conf /etc/webalizer.conf 
    187 %endif 
    188148 
    189149%triggerin glue -- httpd 
    …… 
    197157 
    198158%triggerin glue -- sendmail 
    199 if [ ! -f /etc/mail/aliases ]; then 
    200   if [ -f /etc/mail/aliases.rpmsave ]; then 
    201     /bin/mv /etc/mail/aliases.rpmsave /etc/mail/aliases 
    202   else 
    203     /bin/cp /usr/sausalito/configs/sendmail/aliases /etc/mail/aliases 
    204   fi 
     159if [ ! -f /etc/aliases ]; then 
    205160  /etc/init.d/sendmail condrestart 
    206161fi 
    …… 
    209164    /usr/share/sendmail-cf/hack/popauth.m4 
    210165fi 
    211 /bin/cp /usr/sausalito/triggers/sendmail/smtp.sendmail /etc/pam.d/smtp.sendmail 
    212166 
    213167# for distributions 
    214 %if "%centos" == "4" 
    215 %triggerin glue -- centos-yumconf 
    216 /bin/cp /usr/sausalito/triggers/centos-yumconf/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo 
    217168%triggerin glue -- iptables 
    218 /bin/cp /usr/sausalito/triggers/iptables/iptables-CentOS4.init /etc/init.d/iptables 
     169/bin/cp /usr/sausalito/triggers/iptables/iptables.init /etc/init.d/iptables 
    219170%triggerin glue -- initscripts 
    220 /bin/cp /usr/sausalito/triggers/initscripts/ifup-CentOS4 /sbin/ifup 
    221 %endif 
     171/bin/cp /usr/sausalito/triggers/initscripts/ifup /sbin/ifup 
    222172 
    223173%triggerin glue -- dovecot 
    224 /bin/cat /etc/dovecot.conf | \ 
    225 /bin/sed -e 's|#default_mail_env =|default_mail_env = mbox:~/mail/:INBOX=mbox|' \ 
    226 -e 's|#pop3_uidl_format = %08Xu%08Xv|pop3_uidl_format = %08Xu%08Xv|' \ 
    227 > /etc/dovecot.conf.new 
    228 /bin/mv /etc/dovecot.conf.new /etc/dovecot.conf 
    229  
    230 %if "%centos" == "3" 
    231 %triggerin glue -- yum 
    232 /bin/cp /usr/sausalito/triggers/yum/yum-centos3.conf /etc/yum.conf 
    233 %triggerin glue -- iptables 
    234 /bin/cp /usr/sausalito/triggers/iptables/iptables-CentOS3.init /etc/init.d/iptables 
    235 %triggerin glue -- initscripts 
    236 /bin/cp /usr/sausalito/triggers/initscripts/ifup-CentOS3 /sbin/ifup 
    237 %endif 
    238  
    239 %if "%fedora" == "1" 
    240 %triggerin glue -- yum 
    241 /bin/cp /usr/sausalito/triggers/yum/yum-fc1.conf /etc/yum.conf 
    242 %triggerin glue -- iptables 
    243 /bin/cp /usr/sausalito/triggers/iptables/iptables-FC1.init /etc/init.d/iptables 
    244 %triggerin glue -- initscripts 
    245 /bin/cp /usr/sausalito/triggers/initscripts/ifup-FC1 /sbin/ifup 
    246 %endif 
     174#/bin/cat /etc/dovecot.conf | \ 
     175#/bin/sed -e 's|#default_mail_env =|default_mail_env = mbox:~/mail/:INBOX=mbox|' \ 
     176#-e 's|#pop3_uidl_format = %08Xu%08Xv|pop3_uidl_format = %08Xu%08Xv|' \ 
     177#> /etc/dovecot.conf.new 
     178#/bin/mv /etc/dovecot.conf.new /etc/dovecot.conf 
    247179<end $TRIGGERIN> 
    248180 
    249181<begin $TRIGGERUN> 
    250182%triggerpostun glue -- sendmail 
    251 if [ ! -f /etc/mail/aliases ]; then 
    252   if [ -f /etc/mail/aliases.rpmsave ]; then 
    253     /bin/mv /etc/mail/aliases.rpmsave /etc/mail/aliases 
    254   else 
    255     /bin/cp /usr/sausalito/configs/sendmail/aliases /etc/mail/aliases 
    256   fi 
     183if [ ! -f /etc/aliases ]; then 
    257184  /etc/init.d/sendmail condrestart 
    258185fi 
    …… 
    260187 
    261188<begin $CHANGELOG> 
     189* Tue Jan 01 2008 Hisao SHIBUYA <shibuya@bluequartz.org> 0.20080101BQ2 
     190- remove initSpool.sh to store the mail on homedir. 
     191 
     192* Sun May 06 2007 Hisao SHIBUYA <shibuya@bluequartz.org> 0.20070624BQ1 
     193- build for 5200R on CentOS5. 
     194 
    262195* Thu Oct 12 2006 Hisao SHIBUYA <shibuya@alpha.or.jp> 1.20061012BQ75 
    263196- fixed capability issue on dnsAdmin.