Index: trunk/server/fedora/Makefile =================================================================== --- trunk/server/fedora/Makefile (revision 2581) +++ trunk/server/fedora/Makefile (revision 2591) @@ -19,10 +19,11 @@ # See /COPYRIGHT in this repository for more information. -upstream_yum = krb5 krb5.i686 httpd openssh rubygems gnutls kernel openssl openssl.i686 -hackage = cgi-3001.1.8.2 unix-handle-0.0.0 +upstream_yum = krb5 krb5.i686 httpd openssh +hackage = cgi-3001.1.8.5 unix-handle-0.0.0 upstream_hackage = ghc-cgi ghc-unix-handle -gems = pony:1.8 -upstream_gems = rubygem-pony -upstream = openafs $(upstream_yum) $(upstream_hackage) $(upstream_gems) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss +gems = pony:1.8 fcgi:0.9.2.1 +upstream_gems = rubygem-pony rubygem-fcgi +upstream_eggs = python-authkit +upstream = openafs $(upstream_yum) $(upstream_hackage) $(upstream_gems) $(upstream_eggs) moira zephyr zephyr.i686 python-zephyr python-afs python-moira python-hesiod athena-aclocal discuss oursrc = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs scripts-munin-plugins allsrc = $(upstream) $(oursrc) @@ -40,7 +41,6 @@ dload = ${PWD}/.dload -openafs_url = "https://www.openafs.org/dl/openafs/1.6.5/openafs-1.6.5-1.src.rpm" -zephyr_url = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz" -openssl_url = "https://www.openssl.org/source/openssl-1.0.0n.tar.gz" +openafs_url = "https://www.openafs.org/dl/openafs/1.6.8/openafs-1.6.8-1.src.rpm" +#zephyr_url = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz" PKG = $(patsubst %.i686,%,$@) @@ -70,6 +70,5 @@ cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum) wget -P $(dload) $(openafs_url) - wget -P $(dload) $(zephyr_url) - wget -P $(tmp_src) $(openssl_url) + #wget -P $(dload) $(zephyr_url) cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/ cabal update @@ -77,8 +76,10 @@ cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src) $(foreach gem, $(gems), gem fetch $(firstword $(subst :, ,$(gem))) -v $(lastword $(subst :, ,$(gem)));) + spectool -g -R $(specs)/zephyr.spec spectool -g -R $(specs)/python-zephyr.spec spectool -g -R $(specs)/python-afs.spec spectool -g -R $(specs)/python-moira.spec spectool -g -R $(specs)/python-hesiod.spec + spectool -g -R $(specs)/python-authkit.spec touch download_stamp @@ -153,10 +154,10 @@ PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec - /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc20-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` $(filter-out %.i686,$(oursrc)): %: setup PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec - /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` $(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')' @@ -166,14 +167,14 @@ $(filter %.i686,$(upstream)): %.i686: setup patch-specs rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec - /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc20-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` $(filter-out %.i686,$(upstream)): %: setup patch-specs rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec - /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1` openafs-kernel: setup PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \ rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec - /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1` + /usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1` #sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong Index: trunk/server/fedora/config/etc/default/grub =================================================================== --- trunk/server/fedora/config/etc/default/grub (revision 2581) +++ trunk/server/fedora/config/etc/default/grub (revision 2591) @@ -4,3 +4,3 @@ GRUB_TERMINAL="serial console" GRUB_SERIAL_COMMAND="serial" -GRUB_CMDLINE_LINUX="rd.md=0 rd.lvm=0 rd.dm=0 console=hvc0 KEYTABLE=us rd.luks=0 SYSFONT=True LANG=en_US.UTF-8" +GRUB_CMDLINE_LINUX="rd.md=0 rd.lvm=0 rd.dm=0 KEYTABLE=us rd.luks=0 SYSFONT=True LANG=en_US.UTF-8 net.ifnames=0" Index: trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf (revision 2591) @@ -36,4 +36,5 @@ + SSLVerifyClient require @@ -41,2 +42,3 @@ RewriteRule /afs/athena.mit.edu/contrib/scripts/www/certerror /__scripts/unauthorized.html [L] + Index: trunk/server/fedora/config/etc/httpd/conf/httpd.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/conf/httpd.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/conf/httpd.conf (revision 2591) @@ -5,4 +5,6 @@ MaxKeepAliveRequests 1000 KeepAliveTimeout 15 + +LoadModule mpm_worker_module modules/mod_mpm_worker.so @@ -35,11 +37,17 @@ +# This file configures systemd module: +LoadModule systemd_module modules/mod_systemd.so + +# Enable .htaccess files to use the legacy Order By syntax +LoadModule access_compat_module modules/mod_access_compat.so + LoadModule auth_basic_module modules/mod_auth_basic.so LoadModule auth_digest_module modules/mod_auth_digest.so +LoadModule authn_core_module modules/mod_authn_core.so LoadModule authn_file_module modules/mod_authn_file.so -LoadModule authn_alias_module modules/mod_authn_alias.so LoadModule authn_anon_module modules/mod_authn_anon.so #LoadModule authn_dbm_module modules/mod_authn_dbm.so -LoadModule authn_default_module modules/mod_authn_default.so +LoadModule authz_core_module modules/mod_authz_core.so LoadModule authz_host_module modules/mod_authz_host.so LoadModule authz_user_module modules/mod_authz_user.so @@ -47,5 +55,4 @@ LoadModule authz_groupfile_module modules/mod_authz_groupfile.so #LoadModule authz_dbm_module modules/mod_authz_dbm.so -LoadModule authz_default_module modules/mod_authz_default.so LoadModule ldap_module modules/mod_ldap.so #LoadModule authnz_ldap_module modules/mod_authnz_ldap.so @@ -86,5 +93,7 @@ LoadModule cgi_module modules/mod_cgi.so LoadModule ssl_module modules/mod_ssl.so +LoadModule socache_shmcb_module modules/mod_socache_shmcb.so LoadModule vhost_ldap_module modules/mod_vhost_ldap.so +LoadModule unixd_module modules/mod_unixd.so User apache @@ -100,4 +109,10 @@ AllowOverride None Options FollowSymLinks IncludesNoExec + # The new syntax wasn't added until 2.4, + # so there's simply no way any deployed sites + # are already using the new syntax. + + SSILegacyExprParser on + @@ -131,11 +146,9 @@ - Order Allow,Deny - Deny from all + Require all denied UseCanonicalName Off TypesConfig /etc/mime.types -DefaultType text/plain #MIMEMagicFile conf/magic @@ -154,6 +167,6 @@ - Alias /__scripts/icons /var/www/icons - + Alias /__scripts/icons /usr/share/httpd/icons/ + Options Indexes AllowOverride None @@ -266,11 +279,4 @@ RLimitNPROC 4096 4096 -NameVirtualHost *:80 -NameVirtualHost *:443 -NameVirtualHost *:444 -NameVirtualHost 18.181.0.50:80 -NameVirtualHost 18.181.0.50:443 -NameVirtualHost 18.181.0.50:444 - ServerName localhost DocumentRoot /afs/athena.mit.edu/contrib/scripts/www @@ -325,16 +331,12 @@ SSLSessionCache shmcb:/var/cache/mod_ssl/scache(512000) SSLSessionCacheTimeout 28800 - SSLMutex default SSLRandomSeed startup file:/dev/urandom 256 SSLRandomSeed connect builtin SSLCryptoDevice builtin - SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem - SSLCertificateKeyFile /etc/pki/tls/private/scripts.key SSLCACertificateFile /etc/pki/tls/certs/ca.pem SSLVerifyClient none SSLOptions +StdEnvVars SSLProtocol all -SSLv2 - SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL + SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5 ServerName scripts-cert.mit.edu @@ -343,5 +345,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/scripts-cert.pem - SSLCertificateChainFile /etc/pki/tls/certs/scripts-cert.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Include conf.d/vhosts-common-ssl-cert.conf @@ -353,5 +354,4 @@ SSLCertificateFile /etc/pki/tls/certs/scripts.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key - SSLCertificateChainFile /etc/pki/tls/certs/scripts.pem @@ -362,9 +362,10 @@ SSLCertificateFile /etc/pki/tls/certs/scripts.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key - SSLCertificateChainFile /etc/pki/tls/certs/scripts.pem # LDAP vhost, w00t w00t ServerName localhost + SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem + SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf @@ -373,4 +374,6 @@ ServerName localhost + SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem + SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Include conf.d/vhost_ldap.conf Include conf.d/vhosts-common-ssl.conf @@ -381,12 +384,6 @@ - ServerName scripts.scripts.mit.edu - ServerAlias *.scripts.mit.edu *.scripts - SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem - Include conf.d/vhost_ldap.conf - Include conf.d/vhosts-common-ssl.conf - - + SSLCertificateFile /etc/pki/tls/certs/scripts.pem + SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Include conf.d/scripts-vhost-names.conf Include conf.d/scripts-vhost.conf @@ -394,13 +391,6 @@ - ServerName scripts.scripts.mit.edu - ServerAlias *.scripts.mit.edu *.scripts - SSLCertificateFile /etc/pki/tls/certs/star.scripts.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.scripts.pem - Include conf.d/vhost_ldap.conf - Include conf.d/vhosts-common-ssl.conf - Include conf.d/vhosts-common-ssl-cert.conf - - + SSLCertificateFile /etc/pki/tls/certs/scripts.pem + SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Include conf.d/scripts-vhost-names.conf Include conf.d/scripts-vhost.conf Index: trunk/server/fedora/config/etc/httpd/vhosts.d/achernya.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/achernya.com.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/achernya.com.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/achernya.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/achernya.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/achernya.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/achernya.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ai6034.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ai6034.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ai6034.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ai6034.pem - SSLCertificateChainFile /etc/pki/tls/certs/ai6034.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/ai6034.pem - SSLCertificateChainFile /etc/pki/tls/certs/ai6034.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/asa.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/asa.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/asa.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/asa.pem - SSLCertificateChainFile /etc/pki/tls/certs/asa.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/asa.pem - SSLCertificateChainFile /etc/pki/tls/certs/asa.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ashdown.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ashdown.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ashdown.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ashdown.pem - SSLCertificateChainFile /etc/pki/tls/certs/ashdown.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/ashdown.pem - SSLCertificateChainFile /etc/pki/tls/certs/ashdown.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/auth.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/auth.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/auth.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/auth.pem - SSLCertificateChainFile /etc/pki/tls/certs/auth.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/auth.pem - SSLCertificateChainFile /etc/pki/tls/certs/auth.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/axo.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/axo.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/axo.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/axo.pem - SSLCertificateChainFile /etc/pki/tls/certs/axo.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/axo.pem - SSLCertificateChainFile /etc/pki/tls/certs/axo.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/bakerfoundation.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/bakerfoundation.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/bakerfoundation.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/bakerfoundation.pem - SSLCertificateChainFile /etc/pki/tls/certs/bakerfoundation.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/bakerfoundation.pem - SSLCertificateChainFile /etc/pki/tls/certs/bakerfoundation.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/barnowl.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/barnowl.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/barnowl.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/barnowl.pem - SSLCertificateChainFile /etc/pki/tls/certs/barnowl.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/barnowl.pem - SSLCertificateChainFile /etc/pki/tls/certs/barnowl.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/bc.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/bc.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/bc.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/bc.pem - SSLCertificateChainFile /etc/pki/tls/certs/bc.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/bc.pem - SSLCertificateChainFile /etc/pki/tls/certs/bc.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/be-it.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/be-it.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/be-it.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/be-it.pem - SSLCertificateChainFile /etc/pki/tls/certs/be-it.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/be-it.pem - SSLCertificateChainFile /etc/pki/tls/certs/be-it.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/blog.gregbrockman.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/blog.gregbrockman.com.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/blog.gregbrockman.com.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/blog.gregbrockman.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/blog.gregbrockman.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/blog.gregbrockman.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/bluechips.emergent-studios.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/bluechips.emergent-studios.com.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/bluechips.emergent-studios.com.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/bluechips.emergent-studios.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/bluechips.emergent-studios.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/bluechips.emergent-studios.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/bluechips.emergent-studios.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/carepackages.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/carepackages.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/carepackages.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/carepackages.pem - SSLCertificateChainFile /etc/pki/tls/certs/carepackages.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/carepackages.pem - SSLCertificateChainFile /etc/pki/tls/certs/carepackages.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/cehs.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/cehs.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/cehs.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/cehs.pem - SSLCertificateChainFile /etc/pki/tls/certs/cehs.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/cehs.pem - SSLCertificateChainFile /etc/pki/tls/certs/cehs.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/chatter.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/chatter.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/chatter.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/chatter.pem - SSLCertificateChainFile /etc/pki/tls/certs/chatter.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/chatter.pem - SSLCertificateChainFile /etc/pki/tls/certs/chatter.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/classof2014.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/classof2014.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/classof2014.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/classof2014.pem - SSLCertificateChainFile /etc/pki/tls/certs/classof2014.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/classof2014.pem - SSLCertificateChainFile /etc/pki/tls/certs/classof2014.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/conner4.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/conner4.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/conner4.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/conner4.pem - SSLCertificateChainFile /etc/pki/tls/certs/conner4.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/conner4.pem - SSLCertificateChainFile /etc/pki/tls/certs/conner4.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/cons.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/cons.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/cons.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/cons.pem - SSLCertificateChainFile /etc/pki/tls/certs/cons.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/cons.pem - SSLCertificateChainFile /etc/pki/tls/certs/cons.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/cosmic-turtle.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/cosmic-turtle.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/cosmic-turtle.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/cosmic-turtle.pem - SSLCertificateChainFile /etc/pki/tls/certs/cosmic-turtle.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/cosmic-turtle.pem - SSLCertificateChainFile /etc/pki/tls/certs/cosmic-turtle.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/courseroad.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/courseroad.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/courseroad.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/courseroad.pem - SSLCertificateChainFile /etc/pki/tls/certs/courseroad.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/courseroad.pem - SSLCertificateChainFile /etc/pki/tls/certs/courseroad.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/crew.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/crew.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/crew.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/crew.pem - SSLCertificateChainFile /etc/pki/tls/certs/crew.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/crew.pem - SSLCertificateChainFile /etc/pki/tls/certs/crew.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/crush.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/crush.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/crush.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/crush.pem - SSLCertificateChainFile /etc/pki/tls/certs/crush.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/crush.pem - SSLCertificateChainFile /etc/pki/tls/certs/crush.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/cs6090.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/cs6090.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/cs6090.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/cs6090.pem - SSLCertificateChainFile /etc/pki/tls/certs/cs6090.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/cs6090.pem - SSLCertificateChainFile /etc/pki/tls/certs/cs6090.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/davidben.net.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/davidben.net.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/davidben.net.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/davidben.net.pem - SSLCertificateChainFile /etc/pki/tls/certs/davidben.net.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/davidben.net.pem - SSLCertificateChainFile /etc/pki/tls/certs/davidben.net.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/dchang.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/dchang.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/dchang.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/dchang.pem - SSLCertificateChainFile /etc/pki/tls/certs/dchang.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/dchang.pem - SSLCertificateChainFile /etc/pki/tls/certs/dchang.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/debathena.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/debathena.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/debathena.conf (revision 2591) @@ -21,5 +21,4 @@ CustomLog /home/logview/debathena.log combined SSLCertificateFile /etc/pki/tls/certs/debathena.pem - SSLCertificateChainFile /etc/pki/tls/certs/debathena.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -34,5 +33,4 @@ CustomLog /home/logview/debathena.log combined SSLCertificateFile /etc/pki/tls/certs/debathena.pem - SSLCertificateChainFile /etc/pki/tls/certs/debathena.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/dnd.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/dnd.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/dnd.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/dnd.pem - SSLCertificateChainFile /etc/pki/tls/certs/dnd.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/dnd.pem - SSLCertificateChainFile /etc/pki/tls/certs/dnd.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/dormbase.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/dormbase.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/dormbase.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/dormbase.pem - SSLCertificateChainFile /etc/pki/tls/certs/dormbase.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/dormbase.pem - SSLCertificateChainFile /etc/pki/tls/certs/dormbase.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/duspexplorer.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/duspexplorer.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/duspexplorer.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/duspexplorer.pem - SSLCertificateChainFile /etc/pki/tls/certs/duspexplorer.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/duspexplorer.pem - SSLCertificateChainFile /etc/pki/tls/certs/duspexplorer.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/eastgate.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/eastgate.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/eastgate.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/eastgate.pem - SSLCertificateChainFile /etc/pki/tls/certs/eastgate.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/eastgate.pem - SSLCertificateChainFile /etc/pki/tls/certs/eastgate.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ec.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ec.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ec.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ec.pem - SSLCertificateChainFile /etc/pki/tls/certs/ec.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/ec.pem - SSLCertificateChainFile /etc/pki/tls/certs/ec.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/edudesignshop.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/edudesignshop.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/edudesignshop.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/edudesignshop.pem - SSLCertificateChainFile /etc/pki/tls/certs/edudesignshop.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/edudesignshop.pem - SSLCertificateChainFile /etc/pki/tls/certs/edudesignshop.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/emit.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/emit.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/emit.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/emit.pem - SSLCertificateChainFile /etc/pki/tls/certs/emit.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/emit.pem - SSLCertificateChainFile /etc/pki/tls/certs/emit.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/familynet.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/familynet.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/familynet.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/familynet.pem - SSLCertificateChainFile /etc/pki/tls/certs/familynet.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/familynet.pem - SSLCertificateChainFile /etc/pki/tls/certs/familynet.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/feed.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/feed.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/feed.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/feed.pem - SSLCertificateChainFile /etc/pki/tls/certs/feed.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/feed.pem - SSLCertificateChainFile /etc/pki/tls/certs/feed.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/finboard.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/finboard.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/finboard.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/finboard.pem - SSLCertificateChainFile /etc/pki/tls/certs/finboard.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/finboard.pem - SSLCertificateChainFile /etc/pki/tls/certs/finboard.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/fridget.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/fridget.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/fridget.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/fridget.pem - SSLCertificateChainFile /etc/pki/tls/certs/fridget.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/fridget.pem - SSLCertificateChainFile /etc/pki/tls/certs/fridget.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/gsc.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/gsc.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/gsc.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/gsc.pem - SSLCertificateChainFile /etc/pki/tls/certs/gsc.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/gsc.pem - SSLCertificateChainFile /etc/pki/tls/certs/gsc.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/hmmt.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/hmmt.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/hmmt.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/hmmt.pem - SSLCertificateChainFile /etc/pki/tls/certs/hmmt.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/hmmt.pem - SSLCertificateChainFile /etc/pki/tls/certs/hmmt.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/impact.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/impact.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/impact.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/impact.pem - SSLCertificateChainFile /etc/pki/tls/certs/impact.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/impact.pem - SSLCertificateChainFile /etc/pki/tls/certs/impact.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/isa.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/isa.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/isa.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/isa.pem - SSLCertificateChainFile /etc/pki/tls/certs/isa.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/isa.pem - SSLCertificateChainFile /etc/pki/tls/certs/isa.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/isawyou.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/isawyou.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/isawyou.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/isawyou.pem - SSLCertificateChainFile /etc/pki/tls/certs/isawyou.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/isawyou.pem - SSLCertificateChainFile /etc/pki/tls/certs/isawyou.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ldpreload.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ldpreload.com.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ldpreload.com.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ldpreload.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/ldpreload.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/ldpreload.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/ldpreload.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/legendary.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/legendary.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/legendary.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/legendary.pem - SSLCertificateChainFile /etc/pki/tls/certs/legendary.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/legendary.pem - SSLCertificateChainFile /etc/pki/tls/certs/legendary.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/listmon.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/listmon.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/listmon.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/listmon.pem - SSLCertificateChainFile /etc/pki/tls/certs/listmon.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/listmon.pem - SSLCertificateChainFile /etc/pki/tls/certs/listmon.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/liyan.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/liyan.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/liyan.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/liyan.pem - SSLCertificateChainFile /etc/pki/tls/certs/liyan.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/liyan.pem - SSLCertificateChainFile /etc/pki/tls/certs/liyan.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/liyanchang.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/liyanchang.com.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/liyanchang.com.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/liyanchang.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/liyanchang.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/liyanchang.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/liyanchang.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/lizdenys.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/lizdenys.com.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/lizdenys.com.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -55,5 +53,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -67,5 +64,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -91,5 +87,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -103,5 +98,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -127,5 +121,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -139,5 +132,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -163,5 +155,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -175,5 +166,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/star.lizdenys.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/star.lizdenys.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/locate.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/locate.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/locate.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/locate.pem - SSLCertificateChainFile /etc/pki/tls/certs/locate.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/locate.pem - SSLCertificateChainFile /etc/pki/tls/certs/locate.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/luke.wf.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/luke.wf.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/luke.wf.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/luke.wf.pem - SSLCertificateChainFile /etc/pki/tls/certs/luke.wf.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/luke.wf.pem - SSLCertificateChainFile /etc/pki/tls/certs/luke.wf.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mailto.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mailto.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mailto.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mailto.pem - SSLCertificateChainFile /etc/pki/tls/certs/mailto.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/mailto.pem - SSLCertificateChainFile /etc/pki/tls/certs/mailto.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/maseeh.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/maseeh.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/maseeh.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/maseeh.pem - SSLCertificateChainFile /etc/pki/tls/certs/maseeh.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/maseeh.pem - SSLCertificateChainFile /etc/pki/tls/certs/maseeh.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/metu.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/metu.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/metu.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/metu.pem - SSLCertificateChainFile /etc/pki/tls/certs/metu.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/metu.pem - SSLCertificateChainFile /etc/pki/tls/certs/metu.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mitchief.org.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mitchief.org.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mitchief.org.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mitchief.org.pem - SSLCertificateChainFile /etc/pki/tls/certs/mitchief.org.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/mitchief.org.pem - SSLCertificateChainFile /etc/pki/tls/certs/mitchief.org.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mitsoc.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mitsoc.pem - SSLCertificateChainFile /etc/pki/tls/certs/mitsoc.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/mitsoc.pem - SSLCertificateChainFile /etc/pki/tls/certs/mitsoc.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/mosh.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/mosh.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/mosh.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/mosh.pem - SSLCertificateChainFile /etc/pki/tls/certs/mosh.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/mosh.pem - SSLCertificateChainFile /etc/pki/tls/certs/mosh.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/next.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/next.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/next.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/next.pem - SSLCertificateChainFile /etc/pki/tls/certs/next.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/next.pem - SSLCertificateChainFile /etc/pki/tls/certs/next.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/nudelta.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/nudelta.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/nudelta.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/nudelta.pem - SSLCertificateChainFile /etc/pki/tls/certs/nudelta.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/nudelta.pem - SSLCertificateChainFile /etc/pki/tls/certs/nudelta.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ofcourse.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ofcourse.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ofcourse.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ofcourse.pem - SSLCertificateChainFile /etc/pki/tls/certs/ofcourse.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/ofcourse.pem - SSLCertificateChainFile /etc/pki/tls/certs/ofcourse.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/picker.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/picker.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/picker.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/picker.pem - SSLCertificateChainFile /etc/pki/tls/certs/picker.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/picker.pem - SSLCertificateChainFile /etc/pki/tls/certs/picker.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/pickr.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/pickr.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/pickr.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/pickr.pem - SSLCertificateChainFile /etc/pki/tls/certs/pickr.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/pickr.pem - SSLCertificateChainFile /etc/pki/tls/certs/pickr.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/psetcentral.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/psetcentral.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/psetcentral.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/psetcentral.pem - SSLCertificateChainFile /etc/pki/tls/certs/psetcentral.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/psetcentral.pem - SSLCertificateChainFile /etc/pki/tls/certs/psetcentral.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/quota.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/quota.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/quota.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/quota.pem - SSLCertificateChainFile /etc/pki/tls/certs/quota.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/quota.pem - SSLCertificateChainFile /etc/pki/tls/certs/quota.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/random-hall.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/random-hall.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/random-hall.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/random-hall.pem - SSLCertificateChainFile /etc/pki/tls/certs/random-hall.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/random-hall.pem - SSLCertificateChainFile /etc/pki/tls/certs/random-hall.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/reify-vhost.py (revision 2591) @@ -63,5 +63,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/%(hname)s.pem - SSLCertificateChainFile /etc/pki/tls/certs/%(hname)s.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -75,5 +74,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/%(hname)s.pem - SSLCertificateChainFile /etc/pki/tls/certs/%(hname)s.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/roost.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/roost.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/roost.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/roost.pem - SSLCertificateChainFile /etc/pki/tls/certs/roost.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/roost.pem - SSLCertificateChainFile /etc/pki/tls/certs/roost.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/rpl.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/rpl.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/rpl.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/rpl.pem - SSLCertificateChainFile /etc/pki/tls/certs/rpl.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/rpl.pem - SSLCertificateChainFile /etc/pki/tls/certs/rpl.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/sayno.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/sayno.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/sayno.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/sayno.pem - SSLCertificateChainFile /etc/pki/tls/certs/sayno.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/sayno.pem - SSLCertificateChainFile /etc/pki/tls/certs/sayno.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/schuh.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/schuh.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/schuh.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/schuh.pem - SSLCertificateChainFile /etc/pki/tls/certs/schuh.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/schuh.pem - SSLCertificateChainFile /etc/pki/tls/certs/schuh.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/set-up.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/set-up.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/set-up.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/set-up.pem - SSLCertificateChainFile /etc/pki/tls/certs/set-up.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/set-up.pem - SSLCertificateChainFile /etc/pki/tls/certs/set-up.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/signup.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/signup.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/signup.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/signup.pem - SSLCertificateChainFile /etc/pki/tls/certs/signup.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/signup.pem - SSLCertificateChainFile /etc/pki/tls/certs/signup.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/sipb.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/sipb.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/sipb.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/sipb.pem - SSLCertificateChainFile /etc/pki/tls/certs/sipb.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/sipb.pem - SSLCertificateChainFile /etc/pki/tls/certs/sipb.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/six101.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/six101.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/six101.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/six101.pem - SSLCertificateChainFile /etc/pki/tls/certs/six101.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/six101.pem - SSLCertificateChainFile /etc/pki/tls/certs/six101.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/swe.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/swe.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/swe.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/swe.pem - SSLCertificateChainFile /etc/pki/tls/certs/swe.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/swe.pem - SSLCertificateChainFile /etc/pki/tls/certs/swe.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/tb.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/tb.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/tb.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/tb.pem - SSLCertificateChainFile /etc/pki/tls/certs/tb.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/tb.pem - SSLCertificateChainFile /etc/pki/tls/certs/tb.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/techfair.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/techfair.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/techfair.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/techfair.pem - SSLCertificateChainFile /etc/pki/tls/certs/techfair.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/techfair.pem - SSLCertificateChainFile /etc/pki/tls/certs/techfair.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/tf.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/tf.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/tf.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/tf.pem - SSLCertificateChainFile /etc/pki/tls/certs/tf.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/tf.pem - SSLCertificateChainFile /etc/pki/tls/certs/tf.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/tibetforum.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/tibetforum.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/tibetforum.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/tibetforum.pem - SSLCertificateChainFile /etc/pki/tls/certs/tibetforum.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/tibetforum.pem - SSLCertificateChainFile /etc/pki/tls/certs/tibetforum.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ties.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ties.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ties.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ties.pem - SSLCertificateChainFile /etc/pki/tls/certs/ties.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/ties.pem - SSLCertificateChainFile /etc/pki/tls/certs/ties.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/tours.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/tours.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/tours.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/tours.pem - SSLCertificateChainFile /etc/pki/tls/certs/tours.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/tours.pem - SSLCertificateChainFile /etc/pki/tls/certs/tours.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/twentytwelve.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/twentytwelve.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/twentytwelve.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/twentytwelve.pem - SSLCertificateChainFile /etc/pki/tls/certs/twentytwelve.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/twentytwelve.pem - SSLCertificateChainFile /etc/pki/tls/certs/twentytwelve.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/ua.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/ua.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/ua.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/ua.pem - SSLCertificateChainFile /etc/pki/tls/certs/ua.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/ua.pem - SSLCertificateChainFile /etc/pki/tls/certs/ua.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/unim.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/unim.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/unim.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/unim.pem - SSLCertificateChainFile /etc/pki/tls/certs/unim.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/unim.pem - SSLCertificateChainFile /etc/pki/tls/certs/unim.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/wakeup.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/wakeup.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/wakeup.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/wakeup.pem - SSLCertificateChainFile /etc/pki/tls/certs/wakeup.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/wakeup.pem - SSLCertificateChainFile /etc/pki/tls/certs/wakeup.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/webathena.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/webathena.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/webathena.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/webathena.pem - SSLCertificateChainFile /etc/pki/tls/certs/webathena.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/webathena.pem - SSLCertificateChainFile /etc/pki/tls/certs/webathena.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/webid.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/webid.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/webid.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/webid.pem - SSLCertificateChainFile /etc/pki/tls/certs/webid.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/webid.pem - SSLCertificateChainFile /etc/pki/tls/certs/webid.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/westgate.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/westgate.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/westgate.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/westgate.pem - SSLCertificateChainFile /etc/pki/tls/certs/westgate.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/westgate.pem - SSLCertificateChainFile /etc/pki/tls/certs/westgate.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/whatsnext.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/whatsnext.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/whatsnext.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/whatsnext.pem - SSLCertificateChainFile /etc/pki/tls/certs/whatsnext.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/whatsnext.pem - SSLCertificateChainFile /etc/pki/tls/certs/whatsnext.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/www.davidben.net.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/www.davidben.net.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/www.davidben.net.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/www.davidben.net.pem - SSLCertificateChainFile /etc/pki/tls/certs/www.davidben.net.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/www.davidben.net.pem - SSLCertificateChainFile /etc/pki/tls/certs/www.davidben.net.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/httpd/vhosts.d/www.liyanchang.com.conf =================================================================== --- trunk/server/fedora/config/etc/httpd/vhosts.d/www.liyanchang.com.conf (revision 2581) +++ trunk/server/fedora/config/etc/httpd/vhosts.d/www.liyanchang.com.conf (revision 2591) @@ -19,5 +19,4 @@ Include conf.d/vhosts-common-ssl.conf SSLCertificateFile /etc/pki/tls/certs/www.liyanchang.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/www.liyanchang.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key @@ -31,5 +30,4 @@ Include conf.d/vhosts-common-ssl-cert.conf SSLCertificateFile /etc/pki/tls/certs/www.liyanchang.com.pem - SSLCertificateChainFile /etc/pki/tls/certs/www.liyanchang.com.pem SSLCertificateKeyFile /etc/pki/tls/private/scripts.key Index: trunk/server/fedora/config/etc/krb5.conf =================================================================== --- trunk/server/fedora/config/etc/krb5.conf (revision 2581) +++ trunk/server/fedora/config/etc/krb5.conf (revision 2591) @@ -1,4 +1,4 @@ [libdefaults] - allow_weak_crypto = true + allow_weak_crypto = false default_realm = ATHENA.MIT.EDU # The following krb5.conf variables are only for MIT Kerberos. Index: trunk/server/fedora/config/etc/mock/scripts-fc19-i386.cfg =================================================================== --- trunk/server/fedora/config/etc/mock/scripts-fc19-i386.cfg (revision 2591) +++ trunk/server/fedora/config/etc/mock/scripts-fc19-i386.cfg (revision 2591) @@ -0,0 +1,69 @@ +config_opts['root'] = 'fedora-19-i386' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc19' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-19&arch=i386 +#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/19/Everything/i386/os/ +failovermethod=priority + +[updates] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f19&arch=i386 +#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/19/i386/ +failovermethod=priority + +[updates-testing] +name=updates-testing +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f19&arch=i386 +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=file:///home/scripts-build/mock-local/ +cost=2000 +enabled=1 + +[scripts] +name=Scripts +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc19/ +enabled=1 +gpgcheck=0 + +[fedora-debuginfo] +name=fedora-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-19&arch=i386 +failovermethod=priority +enabled=0 + +[updates-debuginfo] +name=updates-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f19&arch=i386 +failovermethod=priority +enabled=0 + +[updates-testing-debuginfo] +name=updates-testing-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f19&arch=i386 +failovermethod=priority +enabled=0 +""" Index: trunk/server/fedora/config/etc/mock/scripts-fc19-x86_64.cfg =================================================================== --- trunk/server/fedora/config/etc/mock/scripts-fc19-x86_64.cfg (revision 2591) +++ trunk/server/fedora/config/etc/mock/scripts-fc19-x86_64.cfg (revision 2591) @@ -0,0 +1,69 @@ +config_opts['root'] = 'fedora-19-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc19' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-19&arch=x86_64 +#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/19/Everything/x86_64/os/ +failovermethod=priority + +[updates] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f19&arch=x86_64 +#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/19/x86_64/ +failovermethod=priority + +[updates-testing] +name=updates-testing +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f19&arch=x86_64 +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=file:///home/scripts-build/mock-local/ +cost=2000 +enabled=1 + +[scripts] +name=Scripts +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc19/ +enabled=1 +gpgcheck=0 + +[fedora-debuginfo] +name=fedora-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-19&arch=x86_64 +failovermethod=priority +enabled=0 + +[updates-debuginfo] +name=updates-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f19&arch=x86_64 +failovermethod=priority +enabled=0 + +[updates-testing-debuginfo] +name=updates-testing-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f19&arch=x86_64 +failovermethod=priority +enabled=0 +""" Index: trunk/server/fedora/config/etc/mock/scripts-fc20-x86_64.cfg =================================================================== --- trunk/server/fedora/config/etc/mock/scripts-fc20-x86_64.cfg (revision 2591) +++ trunk/server/fedora/config/etc/mock/scripts-fc20-x86_64.cfg (revision 2591) @@ -0,0 +1,71 @@ +config_opts['root'] = 'fedora-20-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '20' + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=x86_64 +#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/20/Everything/x86_64/os/ +failovermethod=priority + +[updates] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=x86_64 +#baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/20/x86_64/ +failovermethod=priority + +[updates-testing] +name=updates-testing +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f20&arch=x86_64 +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=file:///home/scripts-build/mock-local/ +cost=2000 +enabled=1 + +[scripts] +name=Scripts +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc20/ +enabled=1 +gpgcheck=0 + +[fedora-debuginfo] +name=fedora-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-20&arch=x86_64 +failovermethod=priority +enabled=0 + +[updates-debuginfo] +name=updates-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f20&arch=x86_64 +failovermethod=priority +enabled=0 + +[updates-testing-debuginfo] +name=updates-testing-debuginfo +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f20&arch=x86_64 +failovermethod=priority +enabled=0 +""" Index: trunk/server/fedora/config/etc/munin/munin-node.conf =================================================================== --- trunk/server/fedora/config/etc/munin/munin-node.conf (revision 2581) +++ trunk/server/fedora/config/etc/munin/munin-node.conf (revision 2591) @@ -4,5 +4,5 @@ log_level 4 -log_file /var/log/munin/munin-node.log +log_file /var/log/munin-node/munin-node.log pid_file /var/run/munin/munin-node.pid Index: trunk/server/fedora/config/etc/nagios/nrpe.cfg =================================================================== --- trunk/server/fedora/config/etc/nagios/nrpe.cfg (revision 2581) +++ trunk/server/fedora/config/etc/nagios/nrpe.cfg (revision 2591) @@ -24,5 +24,5 @@ # user and is running in standalone mode. -pid_file=/var/run/nrpe.pid +pid_file=/var/run/nrpe/nrpe.pid Index: trunk/server/fedora/config/etc/nsswitch.conf =================================================================== --- trunk/server/fedora/config/etc/nsswitch.conf (revision 2581) +++ trunk/server/fedora/config/etc/nsswitch.conf (revision 2591) @@ -46,5 +46,5 @@ #hosts: db files nisplus nis dns -hosts: files dns +hosts: files dns myhostname #hosts: files mdns4_minimal [NOTFOUND=return] dns Index: trunk/server/fedora/config/etc/php.d/ctype.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/ctype.ini (revision 2591) +++ trunk/server/fedora/config/etc/php.d/ctype.ini (revision 2591) @@ -0,0 +1,2 @@ +; Enable ctype extension module +extension=ctype.so Index: trunk/server/fedora/config/etc/php.d/iconv.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/iconv.ini (revision 2591) +++ trunk/server/fedora/config/etc/php.d/iconv.ini (revision 2591) @@ -0,0 +1,2 @@ +; Enable iconv extension module +extension=iconv.so Index: trunk/server/fedora/config/etc/php.d/mysql.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/mysql.ini (revision 2581) +++ (revision ) @@ -1,1 +1,0 @@ -extension = mysql.so Index: trunk/server/fedora/config/etc/php.d/mysqlnd.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/mysqlnd.ini (revision 2591) +++ trunk/server/fedora/config/etc/php.d/mysqlnd.ini (revision 2591) @@ -0,0 +1,2 @@ +; Enable mysqlnd extension module +extension=mysqlnd.so Index: trunk/server/fedora/config/etc/php.d/mysqlnd_mysql.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/mysqlnd_mysql.ini (revision 2591) +++ trunk/server/fedora/config/etc/php.d/mysqlnd_mysql.ini (revision 2591) @@ -0,0 +1,2 @@ +; Enable mysqlnd_mysql extension module +extension=mysqlnd_mysql.so Index: trunk/server/fedora/config/etc/php.d/mysqlnd_mysqli.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/mysqlnd_mysqli.ini (revision 2591) +++ trunk/server/fedora/config/etc/php.d/mysqlnd_mysqli.ini (revision 2591) @@ -0,0 +1,2 @@ +; Enable mysqlnd_mysqli extension module +extension=mysqlnd_mysqli.so Index: trunk/server/fedora/config/etc/php.d/xml.ini =================================================================== --- trunk/server/fedora/config/etc/php.d/xml.ini (revision 2591) +++ trunk/server/fedora/config/etc/php.d/xml.ini (revision 2591) @@ -0,0 +1,2 @@ +; Enable xml extension module +extension=xml.so Index: trunk/server/fedora/config/etc/postfix/main.cf =================================================================== --- trunk/server/fedora/config/etc/postfix/main.cf (revision 2581) +++ trunk/server/fedora/config/etc/postfix/main.cf (revision 2591) @@ -18,6 +18,6 @@ recipient_delimiter = + inet_interfaces = all -readme_directory = /usr/share/doc/postfix-2.9.6/README_FILES -sample_directory = /usr/share/doc/postfix-2.9.6/samples +readme_directory = /usr/share/doc/postfix-2.10.2/README_FILES +sample_directory = /usr/share/doc/postfix-2.10.2/samples sendmail_path = /usr/sbin/sendmail html_directory = no Index: trunk/server/fedora/config/etc/scripts/allowed-filecaps.list =================================================================== --- trunk/server/fedora/config/etc/scripts/allowed-filecaps.list (revision 2581) +++ trunk/server/fedora/config/etc/scripts/allowed-filecaps.list (revision 2591) @@ -1,4 +1,6 @@ /usr/bin/ping /usr/bin/ping6 +/usr/bin/systemd-detect-virt /usr/sbin/fping /usr/sbin/fping6 +/usr/sbin/mtr Index: trunk/server/fedora/config/etc/sysconfig/httpd =================================================================== --- trunk/server/fedora/config/etc/sysconfig/httpd (revision 2581) +++ trunk/server/fedora/config/etc/sysconfig/httpd (revision 2591) @@ -7,5 +7,5 @@ # The service must be stopped before changing this variable. # -HTTPD=/usr/sbin/httpd.worker +HTTPD=/usr/sbin/httpd # Index: trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth0 =================================================================== --- trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth0 (revision 2591) +++ trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth0 (revision 2591) @@ -0,0 +1,1 @@ +default via 18.181.0.1 Index: trunk/server/fedora/config/etc/yum.repos.d/fedora-updates-testing.repo =================================================================== --- trunk/server/fedora/config/etc/yum.repos.d/fedora-updates-testing.repo (revision 2581) +++ trunk/server/fedora/config/etc/yum.repos.d/fedora-updates-testing.repo (revision 2591) @@ -3,5 +3,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/testing/$releasever/$basearch/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch enabled=0 @@ -13,5 +13,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/testing/$releasever/$basearch/debug/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch enabled=0 @@ -23,5 +23,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/testing/$releasever/SRPMS/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch enabled=0 Index: trunk/server/fedora/config/etc/yum.repos.d/fedora-updates.repo =================================================================== --- trunk/server/fedora/config/etc/yum.repos.d/fedora-updates.repo (revision 2581) +++ trunk/server/fedora/config/etc/yum.repos.d/fedora-updates.repo (revision 2591) @@ -3,5 +3,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/$releasever/$basearch/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch enabled=1 @@ -13,5 +13,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/$releasever/$basearch/debug/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch enabled=0 @@ -23,5 +23,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/$releasever/SRPMS/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch enabled=0 Index: trunk/server/fedora/config/etc/yum.repos.d/fedora.repo =================================================================== --- trunk/server/fedora/config/etc/yum.repos.d/fedora.repo (revision 2581) +++ trunk/server/fedora/config/etc/yum.repos.d/fedora.repo (revision 2591) @@ -3,5 +3,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/os/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch enabled=1 @@ -14,5 +14,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/debug/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch enabled=0 @@ -25,5 +25,5 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/ -baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/source/SRPMS/ +baseurl=http://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/ #mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch enabled=0 Index: trunk/server/fedora/config/etc/yum.repos.d/scripts.repo =================================================================== --- trunk/server/fedora/config/etc/yum.repos.d/scripts.repo (revision 2581) +++ trunk/server/fedora/config/etc/yum.repos.d/scripts.repo (revision 2591) @@ -1,5 +1,5 @@ [scripts] name=Scripts -baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/ +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc20/ enabled=1 gpgcheck=0 @@ -7,5 +7,5 @@ [scripts-testing] name=Scripts Testing -baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17-testing/ +baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc20-testing/ enabled=0 gpgcheck=0 Index: trunk/server/fedora/config/etc/yum/post-actions/capoverride.action =================================================================== --- trunk/server/fedora/config/etc/yum/post-actions/capoverride.action (revision 2581) +++ trunk/server/fedora/config/etc/yum/post-actions/capoverride.action (revision 2591) @@ -6,2 +6,4 @@ /usr/bin/rlogin:install:setcap -r /usr/bin/rlogin /usr/libexec/pt_chown:install:setcap -r /usr/libexec/pt_chown +/usr/sbin/arping:install:setcap -r /usr/sbin/arping +/usr/sbin/clockdiff:install:setcap -r /usr/sbin/clockdiff Index: trunk/server/fedora/config/etc/yum/post-actions/statoverride.action =================================================================== --- trunk/server/fedora/config/etc/yum/post-actions/statoverride.action (revision 2581) +++ trunk/server/fedora/config/etc/yum/post-actions/statoverride.action (revision 2591) @@ -33,2 +33,8 @@ /usr/sbin/netreport:install:chmod ug-s /usr/sbin/netreport /usr/bin/ssh-agent:install:chmod ug-s /usr/bin/ssh-agent +/usr/bin/uustat:install:chmod ug-s /usr/bin/uustat +/usr/bin/uucp:install:chmod ug-s /usr/bin/uucp +/usr/bin/uux:install:chmod ug-s /usr/bin/uux +/usr/bin/cu:install:chmod ug-s /usr/bin/cu +/usr/bin/uucico:install:chmod ug-s /usr/bin/uucico +/usr/libexec/qemu-bridge-helper:install:chmod ug-s /usr/libexec/qemu-bridge-helper Index: trunk/server/fedora/specs/accountadm.spec =================================================================== --- trunk/server/fedora/specs/accountadm.spec (revision 2581) +++ trunk/server/fedora/specs/accountadm.spec (revision 2591) @@ -10,9 +10,9 @@ BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root BuildRequires: scripts-openafs-devel, scripts-openafs-authlibs-devel -BuildRequires: hesinfo +BuildRequires: hesiod BuildRequires: openldap-clients BuildRequires: krb5-devel BuildRequires: sudo -Requires: hesinfo +Requires: hesiod Requires: openldap-clients Requires: sudo Index: trunk/server/fedora/specs/discuss.spec =================================================================== --- trunk/server/fedora/specs/discuss.spec (revision 2581) +++ trunk/server/fedora/specs/discuss.spec (revision 2591) @@ -1,5 +1,5 @@ # Make sure to update this to coincide with the most recent debathena-discuss # release from http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/ -%define upstreamversion 10.0.15 +%define upstreamversion 10.0.17 Name: discuss Version: %{upstreamversion} @@ -21,5 +21,5 @@ %prep -%setup -q -n debathena-%{name}-%{upstreamversion} +%setup -q -n %{name}-%{upstreamversion} %build @@ -30,5 +30,6 @@ automake --add-missing --foreign || : %configure --without-krb4 --with-krb5 --with-zephyr --with-pager=/usr/bin/less -make %{?_smp_mflags} +#make %{?_smp_mflags} +make %install @@ -56,5 +57,4 @@ %{_bindir}/dspipe %{_bindir}/mkds -%{_bindir}/pmtg %{_bindir}/rmds %{_libexecdir}/edsc @@ -99,4 +99,7 @@ %attr(755,discuss,discuss) %{_localstatedir}/spool/discuss %attr(644,root,root) %config(noreplace) %{_sysconfdir}/xinetd.d/%{name} +%{_libexecdir}/disdebug +%{_libexecdir}/expunge +%{_libexecdir}/recover %pre server @@ -108,4 +111,7 @@ %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 10.0.17-1 +- Update to discuss 10.0.17 + * Tue Mar 19 2013 Alexander Chernyakhovsky - 10.0.15-1 - Update to discuss 10.0.15 Index: trunk/server/fedora/specs/ghc-cgi.spec =================================================================== --- trunk/server/fedora/specs/ghc-cgi.spec (revision 2581) +++ trunk/server/fedora/specs/ghc-cgi.spec (revision 2591) @@ -1,34 +1,43 @@ -# cabal2spec-0.25 +# Generated with cabal-rpm # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name cgi -%global common_summary Haskell %{pkg_name} library +Name: ghc-%{pkg_name} +Version: 3001.1.8.5 +Release: 0.%{scriptsversion}%{?dist} +Summary: A library for writing CGI programs -%global common_description A %{pkg_name} library for Haskell. - -Name: ghc-%{pkg_name} -Version: 3001.1.8.2 -Release: 0.%{scriptsversion}%{?dist} -Summary: %{common_summary} - -Group: System Environment/Libraries License: BSD -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec -BuildRequires: ghc-network-prof -BuildRequires: ghc-parsec-prof -BuildRequires: ghc-mtl-prof -BuildRequires: ghc-MonadCatchIO-mtl-prof -BuildRequires: ghc-xhtml-prof +# Begin cabal-rpm deps: +BuildRequires: ghc-MonadCatchIO-mtl-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-network-devel +BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-old-time-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-xhtml-devel +# End cabal-rpm deps %description -%{common_description} +This is a Haskell library for writing CGI programs. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. @@ -45,17 +54,23 @@ -# devel subpackage -%ghc_devel_package - -%ghc_devel_description +%post devel +%ghc_pkg_recache -%ghc_devel_post_postun +%postun devel +%ghc_pkg_recache -%ghc_files LICENSE +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 3001.1.8.5-0 +- Updated packaging for F20, with cabal-rpm + * Fri May 25 2012 Anders Kaseorg - 3001.1.8.2-0 - regenerated packaging with cabal2spec-0.25.5 Index: trunk/server/fedora/specs/ghc-unix-handle.spec =================================================================== --- trunk/server/fedora/specs/ghc-unix-handle.spec (revision 2581) +++ trunk/server/fedora/specs/ghc-unix-handle.spec (revision 2591) @@ -1,29 +1,38 @@ -# cabal2spec-0.25 # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name unix-handle - -%global common_summary Haskell %{pkg_name} library - -%global common_description A %{pkg_name} library for Haskell. Name: ghc-%{pkg_name} Version: 0.0.0 Release: 0.%{scriptsversion}%{?dist} -Summary: %{common_summary} +Summary: POSIX operations on Handles -Group: System Environment/Libraries License: BSD -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +# Begin cabal-rpm deps: +BuildRequires: ghc-unix-devel +# End cabal-rpm deps %description -%{common_description} +This package provides versions of functions from "System.Posix.Files" that +operate on 'System.IO.Handle' instead of 'System.IO.FilePath' or +'System.Posix.Fd'. This is useful to prevent race conditions that may arise +from looking up the same path twice. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides the Haskell %{pkg_name} library development files. @@ -40,17 +49,23 @@ -# devel subpackage -%ghc_devel_package - -%ghc_devel_description +%post devel +%ghc_pkg_recache -%ghc_devel_post_postun +%postun devel +%ghc_pkg_recache -%ghc_files LICENSE +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files %changelog +* Mon May 26 2014 Alex Chernyakhovsky - 0.0.0-0 +- Updated packaging for F20 with cabal-rpm + * Fri May 25 2012 Anders Kaseorg - 0.0.0-0 - regenerated packaging with cabal2spec-0.25.5 Index: trunk/server/fedora/specs/gnutls.spec.patch =================================================================== --- trunk/server/fedora/specs/gnutls.spec.patch (revision 2581) +++ (revision ) @@ -1,28 +1,0 @@ ---- gnutls.spec.orig 2014-03-08 16:13:24.922925743 -0500 -+++ gnutls.spec 2014-03-08 16:14:50.464231133 -0500 -@@ -1,7 +1,7 @@ - Summary: A TLS protocol implementation - Name: gnutls - Version: 2.12.23 --Release: 2%{?dist} -+Release: 2%{?dist}.scripts.%{scriptsversion} - # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+ - License: GPLv3+ and LGPLv2+ - Group: System Environment/Libraries -@@ -26,6 +26,8 @@ - # Use only FIPS approved ciphers in the FIPS mode - Patch7: gnutls-2.12.21-fips-algorithms.patch - Patch8: gnutls-2.12.23-cve-2013-2116.patch -+# Patch GNUTLS-SA-2014-2 -+Patch9: gnutls-2.12.x-cve-2014-0092.patch - - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - Requires: libgcrypt >= 1.2.2 -@@ -99,6 +101,7 @@ - %patch6 -p1 -b .cli-debug - %patch7 -p1 -b .fips - %patch8 -p1 -b .overread -+%patch9 -p1 -b .cve-2014-0092 - - for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do - touch lib/$i Index: trunk/server/fedora/specs/httpd.spec.patch =================================================================== --- trunk/server/fedora/specs/httpd.spec.patch (revision 2581) +++ trunk/server/fedora/specs/httpd.spec.patch (revision 2591) @@ -1,8 +1,8 @@ ---- /tmp/httpd/httpd.spec.orig 2013-02-14 17:53:29.967176396 -0500 -+++ /tmp/httpd/httpd.spec 2013-02-14 17:54:57.172521444 -0500 -@@ -9,7 +9,7 @@ +--- rpmbuild/SPECS/httpd.spec.~1~ 2014-07-23 06:24:15.000000000 -0400 ++++ httpd.spec 2014-08-26 21:10:34.994027237 -0400 +@@ -15,7 +15,7 @@ Summary: Apache HTTP Server Name: httpd - Version: 2.2.23 + Version: 2.4.10 -Release: 1%{?dist} +Release: 1%{?dist}.scripts.%{scriptsversion} @@ -10,21 +10,27 @@ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html -@@ -57,6 +57,15 @@ - Requires(postun): systemd-units - Requires(post): systemd-units - +@@ -65,6 +65,13 @@ + # Bug fixes + Patch55: httpd-2.4.4-malformed-host.patch + Patch56: httpd-2.4.4-mod_unique_id.patch ++ ++Patch1001: httpd-suexec-scripts.patch ++Patch1002: httpd-mod_status-security.patch ++Patch1003: httpd-304s.patch ++Patch1004: httpd-fixup-vhost.patch ++Patch1005: httpd-allow-null-user.patch ++ + License: ASL 2.0 + Group: System Environment/Daemons + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +@@ -77,6 +84,7 @@ + Provides: webserver + Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} + Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa} +Provides: scripts-httpd = %{version}-%{release} -+Patch1000: httpd-suexec-scripts.patch -+Patch1003: httpd-2.2.x-mod_status-security.patch -+Patch1004: httpd-2.2.x-304.patch -+Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch -+Patch1006: httpd-suexec-cloexec.patch -+Patch1007: httpd-fixup-vhost.patch -+Patch1008: httpd-SSLCompression.patch -+ - %description - The Apache HTTP Server is a powerful, efficient, and extensible - web server. -@@ -67,6 +76,7 @@ + Requires: httpd-tools = %{version}-%{release} + Requires(pre): /usr/sbin/useradd + Requires(preun): systemd-units +@@ -94,6 +102,7 @@ Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel Requires: apr-devel, apr-util-devel, pkgconfig @@ -34,5 +40,5 @@ %description devel The httpd-devel package contains the APXS binary and other files -@@ -105,6 +115,7 @@ +@@ -132,6 +141,7 @@ Requires(post): openssl, /bin/cat Requires(pre): httpd @@ -42,28 +48,29 @@ %description -n mod_ssl -@@ -131,6 +142,14 @@ - # Patch in vendor/release string - sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 +@@ -190,6 +200,12 @@ + %patch55 -p1 -b .malformedhost + %patch56 -p1 -b .uniqueid -+%patch1000 -p1 -b .scripts -+%patch1003 -p1 -b .permitstatus -+%patch1004 -p1 -b .scripts-304 -+%patch1005 -p1 -b .ssl-sessioncache -+%patch1006 -p1 -b .cloexec -+%patch1007 -p1 -b .fixup-vhost -+%patch1008 -p1 -b .sslcompression ++%patch1001 -p1 -b .suexec-scripts ++%patch1002 -p1 -b .mod_status-security ++%patch1003 -p1 -b .scripts-304s ++%patch1004 -p1 -b .fixup-vhost ++%patch1005 -p1 -b .allow-null-user + - # Safety check: prevent build if defined MMN does not equal upstream MMN. - vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` - if test "x${vmmn}" != "x%{mmn}"; then -@@ -191,10 +210,12 @@ - --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ + # Patch in the vendor string + sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h + +@@ -242,11 +258,13 @@ --enable-suexec --with-suexec \ + --enable-suexec-capabilities \ --with-suexec-caller=%{suexec_caller} \ -- --with-suexec-docroot=%{contentdir} \ +- --with-suexec-docroot=%{docroot} \ +- --without-suexec-logfile \ +- --with-suexec-syslog \ + --with-suexec-docroot=/ \ + --with-suexec-userdir=web_scripts \ + --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ - --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ ++ --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ ++ --without-suexec-syslog \ --with-suexec-bin=%{_sbindir}/suexec \ - --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ @@ -71,3 +78,22 @@ --enable-pie \ --with-pcre \ - $* + --enable-mods-shared=all \ +@@ -542,7 +560,8 @@ + %{_sbindir}/fcgistarter + %{_sbindir}/apachectl + %{_sbindir}/rotatelogs +-%caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec ++# cap_dac_override needed to write to /var/log/httpd ++%caps(cap_setuid,cap_setgid,cap_dac_override+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec + + %dir %{_libdir}/httpd + %dir %{_libdir}/httpd/modules +@@ -1014,3 +1033,8 @@ + * Sun Apr 04 2010 Robert Scheck - 2.2.15-1 + - update to 2.2.15 (#572404, #579311) + ++Patch1001: httpd-suexec-scripts.patch ++Patch1002: httpd-mod_status-security.patch ++Patch1003: httpd-304s.patch ++Patch1004: httpd-fixup-vhost.patch ++Patch1005: httpd-allow-null-user.patch Index: trunk/server/fedora/specs/kernel.spec.patch =================================================================== --- trunk/server/fedora/specs/kernel.spec.patch (revision 2581) +++ (revision ) @@ -1,36 +1,0 @@ ---- kernel.spec.orig 2014-05-13 21:12:04.076585365 -0400 -+++ kernel.spec 2014-05-13 21:16:17.885587650 -0400 -@@ -783,6 +783,16 @@ - #rhbz 976837 - Patch25065: fix-ext4-overflows.patch - -+# CVE-2014-0196 (FEDORA-2014-6122) -+Patch30000: cve-2014-0196.patch -+ -+# CVE-2014-3153 -+Patch30001: cve-2014-3153-0.patch -+Patch30002: cve-2014-3153-1.patch -+Patch30003: cve-2014-3153-2.patch -+Patch30004: cve-2014-3153-3.patch -+Patch30005: cve-2014-3153-4.patch -+ - # END OF PATCH DEFINITIONS - - %endif -@@ -1516,6 +1519,16 @@ - #rhbz 976837 - ApplyPatch fix-ext4-overflows.patch - -+# CVE-2014-0196 (FEDORA-2014-6122) -+ApplyPatch cve-2014-0196.patch -+ -+# CVE-2014-3153 -+ApplyPatch cve-2014-3153-0.patch -+ApplyPatch cve-2014-3153-1.patch -+ApplyPatch cve-2014-3153-2.patch -+ApplyPatch cve-2014-3153-3.patch -+ApplyPatch cve-2014-3153-4.patch -+ - # END OF PATCH APPLICATIONS - - %endif Index: trunk/server/fedora/specs/krb5.spec.patch =================================================================== --- trunk/server/fedora/specs/krb5.spec.patch (revision 2581) +++ trunk/server/fedora/specs/krb5.spec.patch (revision 2591) @@ -1,16 +1,16 @@ ---- krb5.spec.orig 2013-05-23 18:04:40.738088099 -0400 -+++ krb5.spec 2013-05-23 18:08:02.592147349 -0400 -@@ -20,7 +20,7 @@ +--- krb5.spec.orig 2014-05-25 19:01:13.701141912 -0400 ++++ krb5.spec 2014-05-25 19:02:11.438816630 -0400 +@@ -41,7 +41,7 @@ Summary: The Kerberos network authentication system Name: krb5 - Version: 1.10.2 --Release: 12%{?dist} -+Release: 12%{?dist}.scripts.%{scriptsversion} + Version: 1.11.5 +-Release: 11%{?dist} ++Release: 11%{?dist}.scripts.%{scriptsversion} # Maybe we should explode from the now-available-to-everybody tarball instead? - # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar + # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.5-signed.tar Source0: krb5-%{version}.tar.gz -@@ -77,6 +77,8 @@ - Patch113: krb5-fast-msg_type.patch - Patch114: krb5-1.11.2-kpasswd_pingpong.patch +@@ -143,6 +143,8 @@ + Patch405: 0005-Be-more-careful-of-target-ccache-collections.patch + Patch406: 0006-Copy-config-entries-to-the-target-ccache.patch +Patch1000: krb5-kuserok-scripts.patch @@ -19,18 +19,19 @@ URL: http://web.mit.edu/kerberos/www/ Group: System Environment/Libraries -@@ -134,6 +136,7 @@ +@@ -232,6 +234,7 @@ %package libs Summary: The shared libraries used by Kerberos 5 Group: System Environment/Libraries +Provides: scripts-krb5-libs, scripts-krb5-libs%{?_isa} + %if 0%{?rhel} == 6 + # Some of the older libsmbclient builds here incorrectly called + # krb5_locate_kdc(), which was mistakenly exported in 1.9. +@@ -410,6 +413,8 @@ + %patch203 -p1 -b .otp2 + %patch204 -p1 -b .move-otp-sockets - %description libs - Kerberos is a network authentication system. The krb5-libs package -@@ -261,6 +264,7 @@ - %patch112 -p1 -b .CVE-2013-1416 - %patch113 -p1 -b .fast-msg_type - %patch114 -p1 -b .kpasswd_pingpong +%patch1000 -p1 -b .kuserok - rm src/lib/krb5/krb/deltat.c ++ + # Take the execute bit off of documentation. + chmod -x doc/krb5-protocol/*.txt - gzip doc/*.ps Index: trunk/server/fedora/specs/openafs.spec.patch =================================================================== --- trunk/server/fedora/specs/openafs.spec.patch (revision 2581) +++ trunk/server/fedora/specs/openafs.spec.patch (revision 2591) @@ -1,6 +1,6 @@ ---- openafs.spec.orig 2013-06-24 04:40:31.000000000 -0400 -+++ openafs.spec 2013-07-18 22:43:10.631044261 -0400 +--- openafs.spec.orig 2014-05-25 21:15:54.539027644 -0400 ++++ openafs.spec 2014-05-25 21:16:27.836268275 -0400 @@ -4,7 +4,7 @@ - %define pkgvers 1.6.4 + %define pkgvers 1.6.8 # for beta/rc releases make pkgrel 0. # for real releases make pkgrel 1 (or more for extra releases) @@ -10,5 +10,5 @@ %{!?fedorakmod: %define fedorakmod 1} %{!?build_dkmspkg: %define build_dkmspkg 1} -@@ -249,9 +249,16 @@ +@@ -249,9 +249,15 @@ %if %{build_modules} BuildRequires: kernel-devel @@ -21,5 +21,4 @@ +Patch1002: openafs-systemd-crond.patch +Patch1003: openafs-systemd-csdb.patch -+Patch1004: openafs-d_drop.patch +%define _default_patch_fuzz 2 + @@ -33,5 +32,5 @@ +Provides: scripts-openafs-client Requires: binutils, openafs = %{version} - %if 0%{?fedora} >= 15 + %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 Requires: systemd-units @@ -382,6 +389,7 @@ @@ -92,5 +91,5 @@ %else -@@ -698,6 +711,12 @@ +@@ -698,6 +711,11 @@ #%setup -q -n %{srcdir} %setup -q -b 1 -n %{srcdir} @@ -100,10 +99,9 @@ +%patch1002 -p1 -b .systemd-crond +%patch1003 -p1 -b .systemd-csdb -+%patch1004 -p1 -b .d_drop + ############################################################################## # # building -@@ -869,6 +887,8 @@ +@@ -871,6 +889,8 @@ %endif %endif @@ -114,5 +112,5 @@ --prefix=%{_prefix} \ --libdir=%{_libdir} \ -@@ -1257,6 +1277,13 @@ +@@ -1267,6 +1287,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* Index: trunk/server/fedora/specs/openssh.spec.patch =================================================================== --- trunk/server/fedora/specs/openssh.spec.patch (revision 2581) +++ trunk/server/fedora/specs/openssh.spec.patch (revision 2591) @@ -1,5 +1,5 @@ ---- openssh.spec.orig 2013-07-15 21:14:52.452894092 -0400 -+++ openssh.spec 2013-07-15 21:18:59.494168115 -0400 -@@ -74,7 +74,7 @@ +--- openssh.spec.orig 2014-05-25 19:03:45.308703615 -0400 ++++ openssh.spec 2014-05-25 19:05:57.593843283 -0400 +@@ -71,7 +71,7 @@ Summary: An open source implementation of SSH protocol versions 1 and 2 Name: openssh @@ -9,24 +9,23 @@ URL: http://www.openssh.com/portable.html #URL1: http://pamsshagentauth.sourceforge.net - #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz -@@ -220,7 +220,7 @@ - Patch904: openssh-5.9p1-change-max-startups.patch - # make sftp's libedit interface marginally multibyte aware (#841771) - Patch908: openssh-5.9p1-sftp-multibyte.patch -- + Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz +@@ -196,6 +196,7 @@ + # ignore environment variables with embedded '=' or '\0' characters (#1077843) + Patch909: openssh-6.4p1-ignore-bad-env-var.patch + +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch License: BSD Group: Applications/Internet -@@ -271,6 +273,7 @@ - Group: Applications/Internet - Requires: openssh = %{version}-%{release} +@@ -254,6 +255,7 @@ + Requires(pre): /usr/sbin/useradd + Requires: pam >= 1.0.1-3 Requires: fipscheck-lib%{_isa} >= 1.3.0 +Provides: scripts-openssh-server - - %package server - Summary: An open source SSH server daemon -@@ -458,10 +461,12 @@ - %patch714 -p0 -b .null-xcrypt + Requires(post): systemd-units + Requires(preun): systemd-units + Requires(postun): systemd-units +@@ -411,10 +413,12 @@ + %patch713 -p1 -b .ctr-cavs %patch800 -p1 -b .gsskex @@ -39,8 +38,8 @@ +# Remove the kuserok patch as it won't apply without patch800 +# %patch901 -p1 -b .kuserok - %patch902 -p1 -b .man-moduli - %patch903 -p1 -b .ipqos - %patch904 -p1 -b .max-startups -@@ -471,6 +476,8 @@ + %patch902 -p1 -b .ccache_name + %patch903 -p1 -b .dh + %patch904 -p1 -b .SP800-131A +@@ -428,6 +432,8 @@ # Nothing here yet %endif Index: trunk/server/fedora/specs/openssl.spec.patch =================================================================== --- trunk/server/fedora/specs/openssl.spec.patch (revision 2581) +++ (revision ) @@ -1,84 +1,0 @@ ---- openssl.spec.orig 2013-02-19 16:06:27.000000000 -0500 -+++ openssl.spec 2014-08-06 20:57:41.043801219 -0400 -@@ -20,13 +20,13 @@ - - Summary: A general purpose cryptography library with TLS implementation - Name: openssl --Version: 1.0.0k --Release: 1%{?dist} -+Version: 1.0.0n -+Release: 0%{?dist}.scripts.%{scriptsversion} - Epoch: 1 - # We have to remove certain patented algorithms from the openssl source - # tarball with the hobble-openssl script which is included below. - # The original openssl upstream tarball cannot be shipped in the .src.rpm. --Source: openssl-%{version}-usa.tar.xz -+Source: https://www.openssl.org/source/openssl-%{version}.tar.gz - Source1: hobble-openssl - Source2: Makefile.certificate - Source6: make-dummy-cert -@@ -44,23 +44,22 @@ - Patch7: openssl-1.0.0-timezone.patch - # Bug fixes - Patch23: openssl-1.0.0-beta4-default-paths.patch --Patch25: openssl-1.0.0a-manfix.patch - # Functionality changes - Patch32: openssl-0.9.8g-ia64.patch - Patch33: openssl-1.0.0-beta4-ca-dir.patch - Patch34: openssl-0.9.6-x509.patch - Patch35: openssl-0.9.8j-version-add-engines.patch --Patch38: openssl-1.0.0-beta5-cipher-change.patch --Patch39: openssl-1.0.0b-ipv6-apps.patch --Patch40: openssl-1.0.0k-fips.patch -+Patch38: openssl-1.0.0n-cipher-change.patch -+Patch39: openssl-1.0.0n-ipv6-apps.patch -+Patch40: openssl-1.0.0n-fips.patch - Patch41: openssl-1.0.0-beta3-fipscheck.patch - Patch43: openssl-1.0.0a-fipsmode.patch - Patch44: openssl-1.0.0-beta3-fipsrng.patch - Patch45: openssl-1.0.1e-env-zlib.patch - Patch47: openssl-1.0.0-beta5-readme-warning.patch --Patch49: openssl-1.0.1a-algo-doc.patch -+Patch49: openssl-1.0.0n-algo-doc.patch - Patch50: openssl-1.0.0-beta4-dtls1-abi.patch --Patch51: openssl-1.0.0k-version.patch -+Patch51: openssl-1.0.0n-version.patch - Patch52: openssl-1.0.0b-aesni.patch - Patch53: openssl-1.0.0-name-hash.patch - Patch54: openssl-1.0.0c-speed-fips.patch -@@ -73,13 +72,11 @@ - Patch61: openssl-1.0.0d-cavs.patch - Patch62: openssl-1.0.0-fips-aesni.patch - Patch63: openssl-1.0.0d-xmpp-starttls.patch --Patch64: openssl-1.0.0k-intelopts.patch - Patch65: openssl-1.0.0e-chil-fixes.patch - Patch66: openssl-1.0.0-sha2test.patch - Patch67: openssl-1.0.0k-secure-getenv.patch - # Backported fixes including security fixes - Patch81: openssl-1.0.0d-padlock64.patch --Patch82: openssl-1.0.0k-backports.patch - - License: OpenSSL - Group: System Environment/Libraries -@@ -143,7 +140,6 @@ - %patch7 -p1 -b .timezone - - %patch23 -p1 -b .default-paths --%patch25 -p1 -b .manfix - - %patch32 -p1 -b .ia64 - %patch33 -p1 -b .ca-dir -@@ -172,13 +168,11 @@ - %patch61 -p1 -b .cavs - %patch62 -p1 -b .fips-aesni - %patch63 -p1 -b .starttls --%patch64 -p1 -b .intelopts - %patch65 -p1 -b .chil - %patch66 -p1 -b .sha2test - %patch67 -p1 -b .secure-getenv - - %patch81 -p1 -b .padlock64 --%patch82 -p1 -b .backports - - # Modify the various perl scripts to reference perl in the right location. - perl util/perlpath.pl `dirname %{__perl}` Index: trunk/server/fedora/specs/python-authkit.spec =================================================================== --- trunk/server/fedora/specs/python-authkit.spec (revision 2591) +++ trunk/server/fedora/specs/python-authkit.spec (revision 2591) @@ -0,0 +1,67 @@ +# sitelib for noarch packages, sitearch for others (remove the unneeded one) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +Name: python-authkit +Version: 0.4.5 +Release: 2%{?dist} +Summary: An authentication and authorization toolkit for WSGI applications and frameworks + +License: MIT +URL: https://pypi.python.org/pypi/AuthKit/0.4.5 +Source0: https://pypi.python.org/packages/source/A/AuthKit/AuthKit-0.4.5.tar.gz + +BuildArch: noarch + +BuildRequires: python-setuptools +BuildRequires: python2-devel + +Requires: python-beaker +Requires: python-decorator +Requires: python-nose +Requires: python-openid +Requires: python-paste +Requires: python-paste-deploy +Requires: python-paste-script +Requires: python-webob + +Patch0: python-authkit.patch + +%description +* Built for WSGI applications and middleware +* Sophisticated and extensible permissions system +* Built in support for HTTP basic, HTTP digest, form, cookie and + OpenID authentication methods plus others +* Easily define users, passwords and roles +* Designed to be totally extensible so you can use the components to + integrate with a database, LDAP connection or your own custom system +* Plays nicely with the Pylons web framework + + +%prep +%setup -q -n AuthKit-%{version} +%patch0 -p1 + + +%build +# Remove CFLAGS=... for noarch packages (unneeded) +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build + + +%install +rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT + + +%files +%doc +# For noarch packages: sitelib +%{python_sitelib}/* + + +%changelog +* Thu Aug 28 2014 Alex Chernyakhovsky - 0.4.5-2 +- Correct ElementTree import. + +* Thu Aug 28 2014 Alex Chernyakhovsky - 0.4.5-1 +- Initial packaging. Index: trunk/server/fedora/specs/rubygem-fcgi.spec =================================================================== --- trunk/server/fedora/specs/rubygem-fcgi.spec (revision 2591) +++ trunk/server/fedora/specs/rubygem-fcgi.spec (revision 2591) @@ -0,0 +1,86 @@ +# Generated from fcgi-0.9.1.gem by gem2rpm -*- rpm-spec -*- +%global gem_name fcgi + +Name: rubygem-%{gem_name} +Version: 0.9.2.1 +Release: 1.scripts.%{scriptsversion}%{?dist} +Summary: FastCGI library for Ruby +Group: Development/Languages +License: BSDL +URL: http://github.com/alphallc/ruby-fcgi-ng +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Requires: ruby(release) +Requires: ruby(rubygems) +Requires: fcgi-devel +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby-devel +BuildRequires: fcgi-devel +Provides: rubygem(%{gem_name}) = %{version} + +%description +FastCGI is a language independent, scalable, open extension to CGI that +provides high performance without the limitations of server specific APIs. +This version aims to be compatible with both 1.8.x and 1.9.x versions of Ruby, +and also will be ported to 2.0.x. + + +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +Documentation for %{name} + +%prep +gem unpack %{SOURCE0} + +%setup -q -D -T -n %{gem_name}-%{version} + +gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec + +%build +# Create the gem as gem install only works on a gem file +gem build %{gem_name}.gemspec + +# %%gem_install compiles any C extensions and installs the gem into ./%gem_dir +# by default, so that we can move it into the buildroot in %%install +%gem_install + +%install +mkdir -p %{buildroot}%{gem_dir} +cp -pa .%{gem_dir}/* \ + %{buildroot}%{gem_dir}/ + +mkdir -p %{buildroot}%{gem_extdir_mri}/lib +# TODO: move the extensions +# mv %{buildroot}%{gem_instdir}/lib/shared_object.so %{buildroot}%{gem_extdir_mri}/lib/ + + + +%files +%dir %{gem_instdir} +%{gem_libdir} +%exclude %{gem_instdir}/ext +%{gem_extdir_mri} +%exclude %{gem_cache} +%{gem_spec} + +%files doc +%doc %{gem_docdir} +%doc %{gem_instdir}/VERSION +%doc %{gem_instdir}/LICENSE +%doc %{gem_instdir}/README.rdoc +%doc %{gem_instdir}/README.signals +%{gem_instdir}/fcgi.gemspec +%{gem_instdir}/test/helper.rb +%{gem_instdir}/test/test_fcgi.rb + +%changelog +* Sat Jul 19 2014 Benjamin Tidor - 0.9.2.1-1 +- Updated to 0.9.2.1, reconfigured for Sscripts + +* Mon Aug 12 2013 Steven Valdez - 0.9.1-1 +- Initial package Index: trunk/server/fedora/specs/rubygem-pony.spec =================================================================== --- trunk/server/fedora/specs/rubygem-pony.spec (revision 2581) +++ trunk/server/fedora/specs/rubygem-pony.spec (revision 2591) @@ -1,9 +1,8 @@ # Generated from pony-1.8.gem by gem2rpm -*- rpm-spec -*- %global gem_name pony -%global rubyabi 1.9.1 Name: rubygem-%{gem_name} Version: 1.8 -Release: 1%{?dist}.scripts.%{scriptsversion} +Release: 2%{?dist}.scripts.%{scriptsversion} Summary: Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello') Group: Development/Languages @@ -11,8 +10,8 @@ URL: http://github.com/benprew/pony Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Requires: ruby(abi) = %{rubyabi} +Requires: ruby(release) Requires: ruby(rubygems) Requires: rubygem(mail) >= 2.0 -BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby @@ -72,4 +71,7 @@ %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 1.8-2 +- Update for Fedora 20 + * Sun Mar 09 2014 Benjamin Tidor - 1.8-1 - Initial package Index: trunk/server/fedora/specs/rubygems.spec.patch =================================================================== --- trunk/server/fedora/specs/rubygems.spec.patch (revision 2581) +++ (revision ) @@ -1,29 +1,0 @@ ---- rubygems.spec.orig 2013-04-05 15:02:08.147935906 -0400 -+++ rubygems.spec 2013-04-05 15:04:14.512566960 -0400 -@@ -26,7 +26,7 @@ - Summary: The Ruby standard for packaging ruby libraries - Name: rubygems - Version: 1.8.25 --Release: 6%{?dist} -+Release: 6%{?dist}.scripts.%{scriptsversion} - Group: Development/Libraries - License: Ruby or MIT - -@@ -60,6 +60,8 @@ - # https://github.com/rubygems/rubygems/issues/210 - Patch109: rubygems-1.8.11-binary-extensions.patch - -+Provides: scripts-rubygems = %{version}-%{release} -+Patch1000: rubygems-rails-require-thread.patch - - Requires: ruby(abi) = 1.9.1 - Requires: rubygem(rdoc) >= 3.9.4 -@@ -105,6 +107,8 @@ - %patch105 -p1 -b .uninst - %patch109 -p1 -b .bindir - -+%patch1000 -p1 -b .thread -+ - # Some of the library files start with #! which rpmlint doesn't like - # and doesn't make much sense - for f in `find lib -name \*.rb` ; do Index: trunk/server/fedora/specs/scripts-base.spec =================================================================== --- trunk/server/fedora/specs/scripts-base.spec (revision 2581) +++ trunk/server/fedora/specs/scripts-base.spec (revision 2591) @@ -22,5 +22,4 @@ Requires: scripts-openssh-server Requires: scripts-static-cat -Requires: scripts-rubygems Requires: sql-signup Requires: tokensys Index: trunk/server/fedora/specs/scripts-static-cat.spec =================================================================== --- trunk/server/fedora/specs/scripts-static-cat.spec (revision 2581) +++ trunk/server/fedora/specs/scripts-static-cat.spec (revision 2591) @@ -1,5 +1,3 @@ -# cabal2spec-0.25 # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell # Link Haskell libs statically for 3x faster startup speed. @@ -11,22 +9,21 @@ Summary: static-cat for scripts.mit.edu -Group: Applications/System -License: GPL -# BEGIN cabal2spec +License: GPL+ URL: http://scripts.mit.edu/ Source0: %{name}.tar.gz -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# END cabal2spec +# Begin cabal-rpm deps: +BuildRequires: ghc-MonadCatchIO-mtl-devel BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cgi-devel >= 3001.1.8 +BuildRequires: ghc-cgi-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-filepath-devel -BuildRequires: ghc-MonadCatchIO-mtl-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-unix-handle-devel +# End cabal-rpm deps %description @@ -51,4 +48,7 @@ %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 0.0-0 +- Updated for F20 with cabal-rpm + * Fri May 25 2012 Anders Kaseorg - 0.0-0 - regenerated packaging with cabal2spec-0.25.5 Index: trunk/server/fedora/specs/zephyr.spec =================================================================== --- trunk/server/fedora/specs/zephyr.spec (revision 2581) +++ trunk/server/fedora/specs/zephyr.spec (revision 2591) @@ -1,4 +1,6 @@ Name: zephyr -Version: 3.0.2 +Version: 3.1.2 +%define commit 54c6b84a81301a1691f9bec10c63c1e36166df9d +%define shortcommit %(c=%{commit}; echo ${c:0:7}) Release: 0.%{scriptsversion}%{?dist} Summary: Client programs for the Zephyr real-time messaging system @@ -7,5 +9,5 @@ License: MIT URL: http://zephyr.1ts.org/ -Source0: http://zephyr.1ts.org/export/HEAD/distribution/%{name}-%{version}.tar.gz +Source0: https://github.com/zephyr-im/zephyr/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz Source1: zhm.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,5 +61,5 @@ %prep -%setup -q +%setup -q -n %{name}-%{commit} cp -p %{SOURCE1} . @@ -142,7 +144,10 @@ %{_libdir}/*.so %{_includedir}/* - +%{_libdir}/pkgconfig/zephyr.pc %changelog +* Mon May 26 2014 Alexander Chernyakhovsky - 3.1.2-0 +- Update to Zephyr 3.1.2, fix packaging for F20 + * Sat Apr 16 2011 Alexander Chernyakhovsky 3.0.1-0 - Zephyr 3.0.1 Index: trunk/server/fedora/specs/zhm.init =================================================================== --- trunk/server/fedora/specs/zhm.init (revision 2581) +++ trunk/server/fedora/specs/zhm.init (revision 2591) @@ -14,6 +14,6 @@ ### BEGIN INIT INFO # Provides: zhm -# Required-Start: $local_fs $remote_fs $network $named -# Required-Stop: $local_fs $remote_fs $network +# Required-Start: $local_fs $network $named +# Required-Stop: $local_fs $network # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6