Ignore:
Timestamp:
Jul 3, 2009, 3:47:04 AM (14 years ago)
Author:
mitchb
Message:
Merge r1225:1237 from trunk to branches/fc11-dev
Location:
branches/fc11-dev
Files:
5 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev

  • branches/fc11-dev/server/fedora/Makefile

    r1220 r1238  
    2121upstream_yum    = krb5 httpd openssh php
    2222upstream        = openafs $(upstream_yum)
    23 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 athrun scripts-base
     23oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr nss-ldapd nss-ldapd.i586 athrun php_scripts scripts-base
    2424allsrc          = $(upstream) $(oursrc)
    2525oursrcdir       = ${PWD}/../common/oursrc
     
    180180# The following packages are needed for our packages
    181181basic-deps      = kernel-devel rpm-build rpmdevtools gcc autoconf patch krb5-workstation glibc-devel.i586 glibc-devel libtool libgcc.i586
    182 oursrc-deps     = hesinfo openldap-clients openldap-devel.i586
     182oursrc-deps     = hesinfo openldap-clients openldap-devel.i586 php-devel
    183183httpdmods-deps  = httpd-devel
    184184httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
  • branches/fc11-dev/server/fedora/config/etc/postfix/main.cf

    r1179 r1238  
    3131virtual_alias_maps = hash:/etc/postfix/virtual, regexp:/etc/postfix/virtual_re
    3232data_directory = /var/lib/postfix
    33 authorized_submit_users = !reuter, static:all
     33authorized_submit_users = !/etc/postfix/blocked_users, static:all
  • branches/fc11-dev/server/fedora/config/usr/vice/etc/CellServDB.local

    r1078 r1238  
    171718.90.0.123                     #sangeet.mit.edu.
    1818>grand.central.org      #GCO Public CellServDB 07 Nov 2008
    19 18.92.0.108                     #grand-opening.mit.edu
     1918.9.48.14                      #grand.mit.edu.
    2020128.2.203.61                    #penn.central.org
    2121130.237.48.87                   #andrew.e.kth.se
     
    255255129.186.6.243                   #afsdb-2.iastate.edu
    256256129.186.142.243                 #afsdb-3.iastate.edu
    257 >soap.mit.edu           #MIT School Of Architecture & Planning
    258 18.89.1.204                     #crypt.mit.edu
    259 18.89.1.209                     #grotto.mit.edu
    260 18.89.2.156                     #ac.mit.edu
    261257>msu.edu                #Michigan State University Main Cell
    26225835.9.7.10                       #afsdb0.cl.msu.edu
  • branches/fc11-dev/server/fedora/specs/scripts-base.spec

    r1140 r1238  
    99Source: %{name}.tar.gz
    1010BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
    11 Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-php
     11Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, scripts-php, php_scripts
    1212%define debug_package %{nil}
    1313
Note: See TracChangeset for help on using the changeset viewer.