diff --git a/javaUtilities/collaboration.dataserver/build.xml b/javaUtilities/collaboration.dataserver/build.xml index 8987ec8147..6a3173b31c 100644 --- a/javaUtilities/collaboration.dataserver/build.xml +++ b/javaUtilities/collaboration.dataserver/build.xml @@ -1,11 +1,15 @@ - - + + + + + + - + @@ -85,12 +89,12 @@ - + - + - + diff --git a/javaUtilities/collaboration.dataserver/scriptBin/start.sh b/javaUtilities/collaboration.dataserver/scriptBin/start.sh index ccf47e9714..0a48ae90f3 100755 --- a/javaUtilities/collaboration.dataserver/scriptBin/start.sh +++ b/javaUtilities/collaboration.dataserver/scriptBin/start.sh @@ -45,7 +45,7 @@ then echo "PID file already exists at $PIDFILE, exiting" exit 1 fi -nohup java $dbArg $logLevel -server -cp lib/uframe/*:lib/foss/* com.raytheon.collaboration.dataserver.DataserverMain & +nohup java $dbArg $logLevel -server -cp lib/uframe/*:lib/foss/* com.raytheon.collaboration.dataserver.DataserverMain > /dev/null 2>collab-dataserver.err & echo $! > $PIDFILE ) diff --git a/javaUtilities/collaboration.dataserver/scriptBin/status.sh b/javaUtilities/collaboration.dataserver/scriptBin/status.sh new file mode 100644 index 0000000000..7c80aaa3e0 --- /dev/null +++ b/javaUtilities/collaboration.dataserver/scriptBin/status.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +# This software was developed and / or modified by Raytheon Company, +# pursuant to Contract DG133W-05-CQ-1067 with the US Government. +# +# U.S. EXPORT CONTROLLED TECHNICAL DATA +# This software product contains export-restricted data whose +# export/transfer/disclosure is restricted by U.S. law. Dissemination +# to non-U.S. persons whether in the United States or abroad requires +# an export license or other authorization. +# +# Contractor Name: Raytheon Company +# Contractor Address: 6825 Pine Street, Suite 340 +# Mail Stop B8 +# Omaha, NE 68106 +# 402.291.0100 +# +# See the AWIPS II Master Rights File ("Master Rights File.pdf") for +# further licensing information. +# +# +# SOFTWARE HISTORY +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Apr 03, 2014 2886 bgonzale Initial creation +# +# + + +(cd $(dirname "$0")/.. +PIDFILE=collabserver.pid + +if [[ -e $PIDFILE ]]; then + PIDID=`cat $PIDFILE` + PROCESS=`ps --pid $PIDID -o args | grep -c "DataserverMain"` + if [ $PROCESS -eq 1 ]; then + echo "HTTP Collaboration Dataserver is running" + else + echo "HTTP Collaboration Dataserver is not running" + fi +else + echo "HTTP Collaboration Dataserver is not running" +fi +) \ No newline at end of file diff --git a/rpms/awips2.core/Installer.collab-dataserver/component.spec b/rpms/awips2.core/Installer.collab-dataserver/component.spec new file mode 100644 index 0000000000..145527b4fe --- /dev/null +++ b/rpms/awips2.core/Installer.collab-dataserver/component.spec @@ -0,0 +1,84 @@ +%define _ant_opts -Dfile.encoding=iso-8859-1 -Dworkspace='..' -Dworkspace_edexOsgi='..' -Dworkspace_javaUtilities='..' -Dworkspace_cots='..' -Ddataserver.root.directory='${RPM_BUILD_ROOT}/awips2/collab-dataserver' + +Name: awips2-collab-dataserver +Summary: AWIPSII Collaboration HTTP Dataserver +Version: %{_component_version} +Release: %{_component_release} +Group: AWIPSII +BuildRoot: %{_build_root} +BuildArch: %{_build_arch} +URL: N/A +License: N/A +Distribution: N/A +Vendor: Raytheon +Packager: Bradley Gonzales + +AutoReq: no +provides: awips2-collab-dataserver +requires: awips2-java, awips2-ant + +%description +%{_component_desc} + +%prep +# Ensure that a "buildroot" has been specified. +if [ "%{_build_root}" = "" ]; then + echo "ERROR: A BuildRoot has not been specified." + echo "FATAL: Unable to Continue ... Terminating." + exit 1 +fi + +if [ -d %{_build_root} ]; then + rm -rf %{_build_root} +fi +/bin/mkdir -p %{_build_root} +if [ $? -ne 0 ]; then + exit 1 +fi + +%build +cd %{_baseline_workspace}/collaboration.dataserver +export ANT_OPTS="%{_ant_opts}" +/awips2/ant/bin/ant -f build.xml build +if [ $? -ne 0 ]; then + exit 1 +fi + +%install +cd %{_baseline_workspace}/collaboration.dataserver +export ANT_OPTS="%{_ant_opts}" +/awips2/ant/bin/ant -f build.xml deploy +if [ $? -ne 0 ]; then + exit 1 +fi + +%pre +%post +%preun +%postun + +%clean +cd %{_baseline_workspace}/collaboration.dataserver +export ANT_OPTS="%{_ant_opts}" +/awips2/ant/bin/ant -f build.xml clean +if [ $? -ne 0 ]; then + exit 1 +fi +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(644,awips,fxalpha,755) +%dir /awips2 +%dir /awips2/collab-dataserver +%dir /awips2/collab-dataserver/bin +/awips2/collab-dataserver/bin/* +%dir /awips2/collab-dataserver/lib +/awips2/collab-dataserver/lib/* + +%defattr(775,awips,fxalpha,775) +%dir /awips2/collab-dataserver/lib/uframe +/awips2/collab-dataserver/lib/uframe/* +%dir /awips2/collab-dataserver/lib/foss +/awips2/collab-dataserver/lib/foss/* +%dir /awips2/collab-dataserver/config +/awips2/collab-dataserver/config/* diff --git a/rpms/awips2.core/Installer.collab-dataserver/configuration/etc/init.d/collab-dataserver b/rpms/awips2.core/Installer.collab-dataserver/configuration/etc/init.d/collab-dataserver new file mode 100644 index 0000000000..5f701adc5f --- /dev/null +++ b/rpms/awips2.core/Installer.collab-dataserver/configuration/etc/init.d/collab-dataserver @@ -0,0 +1,57 @@ +#!/bin/bash +# +# Startup script for the HTTP Collaboration Dataserver servlet +# +# chkconfig: - 85 15 +# description: Servlet for storing and retrieving collaboration data objects. +# processname: collabserver +# pidfile: /var/run/collabserver.pid + +# Source function library. +. /etc/rc.d/init.d/functions + +COLLAB_BIN=/awips2/collab-dataserver/bin +PROG=`basename $0` + +start() { + echo -n $"Starting HTTP Collaboration Dataserver" + # start.sh script starts the service using nohup. + ${COLLAB_BIN}/start.sh + return $? +} + +status() { + ${COLLAB_BIN}/status.sh + return $? +} + +stop() { + echo -n $"Stopping HTTP Collaboration Dataserver" + ${COLLAB_BIN}/stop.sh + return +} + +# See how we were called. +case "$1" in + start) + start + RETVAL=$? + ;; + stop) + stop + RETVAL=$? + ;; + status) + status $httpd + RETVAL=$? + ;; + restart) + stop + start + RETVAL=$? + ;; + echo $"Usage: $PROG {start|stop|restart|status}" + exit 1 +esac + +exit $RETVAL diff --git a/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.init b/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.init deleted file mode 100644 index 8e00fb8b23..0000000000 --- a/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.init +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -# -# httpd Startup script for the Apache HTTP Server used by Openfire -# -# chkconfig: - 85 15 -# description: Apache is a World Wide Web server. It is used to serve \ -# HTML files and CGI. -# processname: httpd -# config: /etc/httpd/conf/httpd.conf -# config: /etc/sysconfig/httpd -# pidfile: /var/run/httpd.pid - -# Source function library. -. /etc/rc.d/init.d/functions - -if [ -f /etc/sysconfig/httpd ]; then - . /etc/sysconfig/httpd -fi - -# Start httpd in the C locale by default. -HTTPD_LANG=${HTTPD_LANG-"C"} - -# This will prevent initlog from swallowing up a pass-phrase prompt if -# mod_ssl needs a pass-phrase from the user. -INITLOG_ARGS="" - -# Set HTTPD=/usr/sbin/httpd.worker in /etc/sysconfig/httpd to use a server -# with the thread-based "worker" MPM; BE WARNED that some modules may not -# work correctly with a thread-based MPM; notably PHP will refuse to start. - -# Path to the apachectl script, server binary, and short-form for messages. -apachectl=/awips2/httpd_openfire/usr/sbin/apachectl -httpd=${HTTPD-/awips2/httpd_openfire/usr/sbin/httpd} -prog=httpd -pidfile=${PIDFILE-/awips2/httpd_openfire/var/run/httpd.pid} -lockfile=${LOCKFILE-/awips2/httpd_openfire/var/lock/subsys/httpd} -RETVAL=0 - -# check for 1.3 configuration -check13 () { - CONFFILE=/awips2/httpd_openfire/etc/httpd/conf/httpd.conf - GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|" - GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|" - GONE="${GONE}AccessConfig|ResourceConfig)" - if LANG=C grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then - echo - echo 1>&2 " Apache 1.3 configuration directives found" - echo 1>&2 " please read @docdir@/migration.html" - failure "Apache 1.3 config directives test" - echo - exit 1 - fi -} - -# The semantics of these two functions differ from the way apachectl does -# things -- attempting to start while running is a failure, and shutdown -# when not running is also a failure. So we just do it the way init scripts -# are expected to behave here. -start() { - echo -n $"Starting $prog: " - check13 || exit 1 - LANG=$HTTPD_LANG daemon $httpd $OPTIONS - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL -} - -# When stopping httpd a delay of >10 second is required before SIGKILLing the -# httpd parent; this gives enough time for the httpd parent to SIGKILL any -# errant children. -stop() { - echo -n $"Stopping $prog: " - killproc -d 10 $httpd - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} -} -reload() { - echo -n $"Reloading $prog: " - if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then - RETVAL=$? - echo $"not reloading due to configuration syntax error" - failure $"not reloading $httpd due to configuration syntax error" - else - killproc $httpd -HUP - RETVAL=$? - fi - echo -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $httpd - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f ${pidfile} ] ; then - stop - start - fi - ;; - reload) - reload - ;; - graceful|help|configtest|fullstatus) - $apachectl $@ - RETVAL=$? - ;; - *) - echo $"Usage: $prog {start|stop|restart|condrestart|reload|status|fullstatus|graceful|help|configtest}" - exit 1 -esac - -exit $RETVAL diff --git a/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.logrotate b/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.logrotate deleted file mode 100644 index 96c4d49713..0000000000 --- a/rpms/awips2.core/Installer.httpd-collaboration/SOURCES/httpd-collaboration.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/awips2/httpd_openfire/var/log/httpd/*log { - missingok - notifempty - sharedscripts - postrotate - /sbin/service httpd-pypies reload > /dev/null 2>/dev/null || true - endscript -} \ No newline at end of file diff --git a/rpms/awips2.core/Installer.httpd-collaboration/component.spec b/rpms/awips2.core/Installer.httpd-collaboration/component.spec deleted file mode 100644 index c760e2520d..0000000000 --- a/rpms/awips2.core/Installer.httpd-collaboration/component.spec +++ /dev/null @@ -1,1020 +0,0 @@ -%define contentdir /var/www -%define suexec_caller apache -%define mmn 20051115 -%define vstring Red Hat -%define mpms worker event - -Summary: Collaboration Apache HTTP Server -Name: awips2-httpd-collaboration -Version: 2.2.15 -Release: 15.2.el6 -URL: http://httpd.apache.org/ -Source0: http://archive.apache.org/dist/httpd/httpd-%{version}.tar.gz -Source1: index.html -Source5: httpd.sysconf -Source10: httpd.conf -Source11: ssl.conf -Source12: welcome.conf -Source13: manual.conf -# Documentation -Source33: README.confd -# build/scripts patches -Patch1: httpd-2.1.10-apctl.patch -Patch2: httpd-2.1.10-apxs.patch -Patch3: httpd-2.2.9-deplibs.patch -Patch4: httpd-2.1.10-disablemods.patch -Patch5: httpd-2.1.10-layout.patch -# Features/functional changes -Patch20: httpd-2.2.14-release.patch -Patch21: httpd-2.2.11-xfsz.patch -Patch22: httpd-2.1.10-pod.patch -Patch23: httpd-2.0.45-export.patch -Patch24: httpd-2.2.11-corelimit.patch -Patch25: httpd-2.2.11-selinux.patch -Patch26: httpd-2.2.15-sslfips.patch -Patch27: httpd-2.2.15-modreqto2217.patch -# Bug fixes -Patch60: httpd-2.0.52-logresline.patch -Patch61: httpd-2.2.3-defpidlog.patch -Patch62: httpd-2.2.3-extfiltereos.patch -Patch63: httpd-2.2.3-graceful-ebadf.patch -Patch64: httpd-2.2.3-noxpad.patch -Patch65: httpd-2.2.3-pngmagic.patch -Patch67: httpd-2.2.14-ldapdyngrp.patch -Patch68: httpd-2.2.15-proxyconn.patch -Patch69: httpd-2.2.0-authnoprov.patch -Patch70: httpd-2.2.15-ssloidval.patch -Patch71: httpd-2.2.15-davputfail.patch -Patch72: httpd-2.2.15-expectnoka.patch -Patch73: httpd-2.2.15-pr49328.patch -Patch74: httpd-2.2.15-aboverflow.patch -Patch75: httpd-2.2.15-pr45444.patch -Patch76: httpd-2.2.15-ssldupkeys.patch -Patch77: httpd-2.2.15-ldapcache.patch -Patch78: httpd-2.2.3-pr41743.patch -Patch79: httpd-2.2.15-filterhdr.patch -Patch80: httpd-2.2.15-oomabort.patch -Patch81: httpd-2.2.15-sslpxycerts.patch -Patch82: httpd-2.2.15-sslproxyio.patch -Patch83: httpd-2.2.15-ajperror.patch -Patch84: httpd-2.2.15-sslsninotreq.patch -Patch85: httpd-2.2.15-sslbadcdev.patch -Patch86: httpd-2.2.15-proxyepsv.patch -Patch87: httpd-2.2.15-cachehardmax.patch -# Security fixes -Patch200: httpd-2.2.15-CVE-2010-1452.patch -Patch201: httpd-2.2.15-CVE-2011-3192ver3.patch -Patch202: httpd-2.2.15-CVE-2011-3368.patch -Patch203: httpd-2.2.15-CVE-2011-3348.patch -License: ASL 2.0 -Group: AWIPSII -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: autoconf, perl, pkgconfig, findutils -BuildRequires: zlib-devel, libselinux-devel -BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0 -Requires: initscripts >= 8.36, /etc/mime.types, system-logos >= 7.92.1-1 -Obsoletes: httpd-suexec -Requires(pre): /usr/sbin/useradd -Requires(post): chkconfig -Provides: webserver -Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} -Provides: httpd-mmn = %{mmn} -Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache -Obsoletes: stronghold-htdocs, mod_put, mod_roaming -Conflicts: pcre < 4.0 -Requires: apr-util-ldap - -%description -The Apache HTTP Server is a powerful, efficient, and extensible -web server. - -%package devel -Group: AWIPSII -Summary: Development interfaces for the Apache HTTP server -Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel -Requires: apr-devel, apr-util-devel, pkgconfig -Requires: httpd = %{version}-%{release} - -%description devel -The httpd-devel package contains the APXS binary and other files -that you need to build Dynamic Shared Objects (DSOs) for the -Apache HTTP Server. - -If you are installing the Apache HTTP server and you want to be -able to compile or develop additional modules for Apache, you need -to install this package. - -%package manual -Group: AWIPSII -Summary: Documentation for the Apache HTTP server -Requires: httpd = %{version}-%{release} -Obsoletes: secureweb-manual, apache-manual -BuildArch: noarch - -%description manual -The httpd-manual package contains the complete manual and -reference guide for the Apache HTTP server. The information can -also be found at http://httpd.apache.org/docs/2.2/. - -%package -n mod_ssl -Group: AWIPSII -Summary: SSL/TLS module for the Apache HTTP Server -Epoch: 1 -BuildRequires: openssl-devel -Requires(post): openssl >= 0.9.7f-4, /bin/cat -Requires(pre): httpd -Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn} -Obsoletes: stronghold-mod_ssl - -%description -n mod_ssl -The mod_ssl module provides strong cryptography for the Apache Web -server via the Secure Sockets Layer (SSL) and Transport Layer -Security (TLS) protocols. - -%prep -%setup -q -n httpd-2.2.15 -%patch1 -p1 -b .apctl -%patch2 -p1 -b .apxs -%patch3 -p1 -b .deplibs -%patch4 -p1 -b .disablemods -%patch5 -p1 -b .layout - -%patch21 -p1 -b .xfsz -%patch22 -p1 -b .pod -%patch23 -p1 -b .export -%patch24 -p1 -b .corelimit -%patch25 -p1 -b .selinux -%patch26 -p1 -b .sslfips -%patch27 -p1 -b .modreqto2217 - -%patch60 -p1 -b .logresline -%patch61 -p1 -b .defpidlog -%patch62 -p1 -b .extfiltereos -%patch63 -p1 -b .graceful-ebadf -%patch64 -p1 -b .noxpad -%patch65 -p1 -b .pngmagic -%patch67 -p1 -b .ldapdyngrp -%patch68 -p1 -b .proxyconn -%patch69 -p1 -b .authnoprov -%patch70 -p1 -b .ssloidval -%patch71 -p1 -b .davputfail -%patch72 -p1 -b .expectnoka -%patch73 -p1 -b .pr49328 -%patch74 -p1 -b .aboverflow -%patch75 -p1 -b .pr45444 -%patch76 -p1 -b .ssldupkeys -%patch77 -p1 -b .ldapcache -%patch78 -p1 -b .pr41743 -%patch79 -p1 -b .filterhdr -%patch80 -p1 -b .oomabort -%patch81 -p1 -b .sslpxycerts -%patch82 -p1 -b .sslproxyio -%patch83 -p1 -b .ajperror -%patch84 -p1 -b .sslsninotreq -%patch85 -p1 -b .sslbadcdev -%patch86 -p1 -b .proxyepsv -%patch87 -p1 -b .cachehardmax - -%patch200 -p1 -b .cve1452 -%patch201 -p1 -b .cve3192ver3 -%patch202 -p1 -b .cve3368 -%patch203 -p1 -b .cve3348 - -# Patch in vendor/release string -sed "s/@VENDOR@/%{vstring}/;s/@RELEASE@/%{release}/" < %{PATCH20} | patch -p1 -b -z .release - -# 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 - : Error: Upstream MMN is now ${vmmn}, packaged MMN is %{mmn}. - : Update the mmn macro and rebuild. - exit 1 -fi - -: Building with MMN %{mmn} and vendor string '%{vstring}' - -%build -# forcibly prevent use of bundled apr, apr-util, pcre -rm -rf srclib/{apr,apr-util,pcre} - -# regenerate configure scripts -autoheader && autoconf || exit 1 - -# Before configure; fix location of build dir in generated apxs -%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \ - support/apxs.in - -CFLAGS="$RPM_OPT_FLAGS -Wformat-security -fno-strict-aliasing" -SH_LDFLAGS="-Wl,-z,relro" -export CFLAGS SH_LDFLAGS - -# Forcibly disable use of rsync to install (#557049) -export ac_cv_path_RSYNC= - -# Hard-code path to links to avoid unnecessary builddep -export LYNX_PATH=/usr/bin/links - -function mpmbuild() -{ -mpm=$1; shift -mkdir $mpm; pushd $mpm -../configure \ - --prefix=/awips2/httpd_collaboration%{_sysconfdir}/httpd \ - --exec-prefix=/awips2/httpd_collaboration%{_prefix} \ - --bindir=/awips2/httpd_collaboration%{_bindir} \ - --sbindir=/awips2/httpd_collaboration%{_sbindir} \ - --mandir=/awips2/httpd_collaboration%{_mandir} \ - --libdir=/awips2/httpd_collaboration%{_libdir} \ - --sysconfdir=/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf \ - --includedir=/awips2/httpd_collaboration%{_includedir}/httpd \ - --libexecdir=/awips2/httpd_collaboration%{_libdir}/httpd/modules \ - --datadir=/awips2/httpd_collaboration%{contentdir} \ - --with-installbuilddir=/awips2/httpd_collaboration%{_libdir}/httpd/build \ - --with-mpm=$mpm \ - --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ - --enable-suexec --with-suexec \ - --with-suexec-caller=%{suexec_caller} \ - --with-suexec-docroot=/awips2/httpd_collaboration%{contentdir} \ - --with-suexec-logfile=/awips2/httpd_collaboration%{_localstatedir}/log/httpd/suexec.log \ - --with-suexec-bin=/awips2/httpd_collaboration%{_sbindir}/suexec \ - --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ - --enable-pie \ - --with-pcre \ - $* - -make %{?_smp_mflags} EXTRA_CFLAGS="-Werror-implicit-function-declaration" -popd -} - -# Build everything and the kitchen sink with the prefork build -mpmbuild prefork \ - --enable-mods-shared=all \ - --enable-ssl --with-ssl \ - --enable-proxy \ - --enable-cache \ - --enable-disk-cache \ - --enable-ldap --enable-authnz-ldap \ - --enable-cgid \ - --enable-authn-anon --enable-authn-alias \ - --disable-imagemap - -# For the other MPMs, just build httpd and no optional modules -for f in %{mpms}; do - mpmbuild $f --enable-modules=none -done - -%install -rm -rf $RPM_BUILD_ROOT - -# Classify ab and logresolve as section 1 commands, as they are in /usr/bin -mv docs/man/ab.8 docs/man/ab.1 -mv docs/man/logresolve.8 docs/man/logresolve.1 - -pushd prefork -make DESTDIR=$RPM_BUILD_ROOT install -popd - -# install alternative MPMs -for f in %{mpms}; do - install -m 755 ${f}/httpd $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/httpd.${f} -done - -# install conf file/directory -mkdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d -install -m 644 $RPM_SOURCE_DIR/README.confd \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/README -for f in ssl.conf welcome.conf manual.conf; do - install -m 644 -p $RPM_SOURCE_DIR/$f \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/$f -done - -rm $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf/*.conf -install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf/httpd.conf - -mkdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/sysconfig -install -m 644 -p $RPM_SOURCE_DIR/httpd.sysconf \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/sysconfig/httpd - -# for holding mod_dav lock database -mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/lib/dav - -# create a prototype session cache -mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/cache/mod_ssl -touch $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/cache/mod_ssl/scache.{dir,pag,sem} - -# create cache root -mkdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/cache/mod_proxy - -# move utilities to /usr/bin -mv $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_bindir} - -# Make the MMN accessible to module packages -echo %{mmn} > $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_includedir}/httpd/.mmn - -# docroot -mkdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/html -install -m 644 -p $RPM_SOURCE_DIR/index.html \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/error/noindex.html - -# remove manual sources -find $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/manual \( \ - -name \*.xml -o -name \*.xml.* -o -name \*.ent -o -name \*.xsl -o -name \*.dtd \ - \) -print0 | xargs -0 rm -f - -# Strip the manual down just to English and replace the typemaps with flat files: -set +x -for f in `find $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/manual -name \*.html -type f`; do - if test -f ${f}.en; then - cp ${f}.en ${f} - rm ${f}.* - fi -done -set -x - -# Symlink for the powered-by-$DISTRO image: -ln -s ../../..%{_datadir}/pixmaps/poweredby.png \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/icons/poweredby.png - -# Set up /var directories -rmdir $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sysconfdir}/httpd/logs -mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/log/httpd -mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/run/httpd -mkdir -p $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_localstatedir}/lock/subsys - -pushd . -cd $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd -# symlinks for /etc/httpd -ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/logs -ln -s ../..%{_localstatedir}/run/httpd $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/run -ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/modules -popd - -# install service script -mkdir -p ${RPM_BUILD_ROOT}/etc/init.d -rpm_core_dir="%{_baseline_workspace}/rpms/awips2.core" -collaboration_project_dir="${rpm_core_dir}/Installer.httpd-collaboration" -install -m755 ${collaboration_project_dir}/configuration/etc/init.d/httpd-collaboration \ - ${RPM_BUILD_ROOT}/etc/init.d - -# install log rotation stuff -mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d -install -m 644 -p ${collaboration_project_dir}/SOURCES/httpd-collaboration.logrotate \ - $RPM_BUILD_ROOT/etc/logrotate.d/httpd-collaboration - -# fix man page paths -sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \ - -e "s|/usr/local/apache2/conf/mime.types|/etc/mime.types|" \ - -e "s|/usr/local/apache2/conf/magic|/etc/httpd/conf/magic|" \ - -e "s|/usr/local/apache2/logs/error_log|/var/log/httpd/error_log|" \ - -e "s|/usr/local/apache2/logs/access_log|/var/log/httpd/access_log|" \ - -e "s|/usr/local/apache2/logs/httpd.pid|/var/run/httpd/httpd.pid|" \ - -e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \ - > $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_mandir}/man8/httpd.8 - -# Make ap_config_layout.h libdir-agnostic -sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_includedir}/httpd/ap_config_layout.h - -# Fix path to instdso in special.mk -sed -i '/instdso/s,top_srcdir,top_builddir,' \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/httpd/build/special.mk - -# Remove unpackaged files -rm -f $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/*.exp \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/conf/mime.types \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/httpd/modules/*.exp \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/httpd/build/config.nice \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_bindir}/ap?-config \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/{checkgid,dbmmanage,envvars*} \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/htdocs/* \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_mandir}/man1/dbmmanage.* \ - $RPM_BUILD_ROOT/awips2/httpd_collaboration%{contentdir}/cgi-bin/* - -rm -rf $RPM_BUILD_ROOT/awips2/httpd_collaboration/etc/httpd/conf/{original,extra} - -# Make suexec a+rw so it can be stripped. %%files lists real permissions -chmod 755 $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_sbindir}/suexec - -# Install the collaboration configuration. -rpm_core_dir="%{_baseline_workspace}/rpms/awips2.core" -collaboration_project_dir="${rpm_core_dir}/Installer.httpd-collaboration" -install -m644 ${collaboration_project_dir}/configuration/apache/collaboration.conf \ - ${RPM_BUILD_ROOT}/awips2/httpd_collaboration/etc/httpd/conf.d - -# Install & Override the httpd configuration. -install -m644 ${collaboration_project_dir}/configuration/conf/httpd.conf \ - ${RPM_BUILD_ROOT}/awips2/httpd_collaboration/etc/httpd/conf - -# create the dav directory -mkdir -p ${RPM_BUILD_ROOT}/awips2/httpd_collaboration/dav -if [ $? -ne 0 ]; then - exit 1 -fi - -# create the session_data directory. -mkdir -p ${RPM_BUILD_ROOT}/awips2/httpd_collaboration/var/www/html/session_data -if [ $? -ne 0 ]; then - exit 1 -fi - -%pre -# Add the "apache" user -getent group apache >/dev/null || groupadd -g 48 -r apache -getent passwd apache >/dev/null || \ - useradd -r -u 48 -g apache -s /sbin/nologin \ - -d %{contentdir} -c "Apache" apache -exit 0 - -%post -# Register the httpd service -/sbin/chkconfig --add httpd-collaboration - -%preun -# this is not compatible with our environment. attempting to shutdown -# httpd-collaboration causes 'yum groupremove' to abort and leaves us with -# an incomplete version of httpd-collaboration that cannot be un-installed. -#if [ $1 = 0 ]; then -# /sbin/service httpd stop > /dev/null 2>&1 -# /sbin/chkconfig --del httpd -#fi - -%posttrans -/sbin/service httpd condrestart >/dev/null 2>&1 || : - -%define sslcert /awips2/httpd_collaboration%{_sysconfdir}/pki/tls/certs/localhost.crt -%define sslkey /awips2/httpd_collaboration%{_sysconfdir}/pki/tls/private/localhost.key - -%post -n mod_ssl -umask 077 - -if [ ! -f %{sslkey} ] ; then -/awips2/httpd_collaboration%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{sslkey} 2> /dev/null -fi - -FQDN=`hostname` -if [ "x${FQDN}" = "x" ]; then - FQDN=localhost.localdomain -fi - -if [ ! -f %{sslcert} ] ; then -cat << EOF | /awips2/httpd_collaboration%{_bindir}/openssl req -new -key %{sslkey} \ - -x509 -days 365 -set_serial $RANDOM \ - -out %{sslcert} 2>/dev/null --- -SomeState -SomeCity -SomeOrganization -SomeOrganizationalUnit -${FQDN} -root@${FQDN} -EOF -fi - -%check -# Check the built modules are all PIC -if readelf -d $RPM_BUILD_ROOT/awips2/httpd_collaboration%{_libdir}/httpd/modules/*.so | grep TEXTREL; then - : modules contain non-relocatable code - exit 1 -fi - -# Verify that the same modules were built into the httpd binaries -./prefork/httpd -l | grep -v prefork > prefork.mods -for mpm in %{mpms}; do - ./${mpm}/httpd -l | grep -v ${mpm} > ${mpm}.mods - if ! diff -u prefork.mods ${mpm}.mods; then - : Different modules built into httpd binaries, will not proceed - exit 1 - fi -done - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,awips,fxalpha) - -%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE - -%dir /awips2/httpd_collaboration -%dir /awips2/httpd_collaboration/etc -%dir /awips2/httpd_collaboration/etc/sysconfig -%dir /awips2/httpd_collaboration/usr -%dir /awips2/httpd_collaboration/usr/bin -%dir /awips2/httpd_collaboration%{_libdir} -%dir /awips2/httpd_collaboration/usr/sbin -/awips2/httpd_collaboration/usr/share -%dir /awips2/httpd_collaboration/var -%dir /awips2/httpd_collaboration/var/cache -%dir /awips2/httpd_collaboration/var/lib -%dir /awips2/httpd_collaboration/var/log -%dir /awips2/httpd_collaboration%{_sysconfdir}/httpd -%dir /awips2/httpd_collaboration/var/run -/awips2/httpd_collaboration%{_sysconfdir}/httpd/modules -/awips2/httpd_collaboration%{_sysconfdir}/httpd/logs -/awips2/httpd_collaboration%{_sysconfdir}/httpd/run -%dir /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf -%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf/httpd.conf -%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/collaboration.conf -%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/welcome.conf -%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf/magic - -%config(noreplace) %{_sysconfdir}/logrotate.d/httpd-collaboration -%config(noreplace) %{_sysconfdir}/init.d/httpd-collaboration - -%dir /awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d -/awips2/httpd_collaboration%{_sysconfdir}/httpd/conf.d/README - -%config(noreplace) /awips2/httpd_collaboration%{_sysconfdir}/sysconfig/httpd - -/awips2/httpd_collaboration%{_bindir}/* -/awips2/httpd_collaboration%{_sbindir}/ht* -/awips2/httpd_collaboration%{_sbindir}/apachectl -/awips2/httpd_collaboration%{_sbindir}/rotatelogs -%attr(4510,awips,fxalpha) /awips2/httpd_collaboration%{_sbindir}/suexec - -%dir /awips2/httpd_collaboration%{_libdir}/httpd -%dir /awips2/httpd_collaboration%{_libdir}/httpd/modules -/awips2/httpd_collaboration%{_libdir}/httpd/modules/mod*.so -%exclude /awips2/httpd_collaboration%{_libdir}/httpd/modules/mod_ssl.so - -%dir /awips2/httpd_collaboration%{contentdir} -%dir /awips2/httpd_collaboration%{contentdir}/cgi-bin -%dir /awips2/httpd_collaboration%{contentdir}/html -%dir /awips2/httpd_collaboration%{contentdir}/icons -%dir /awips2/httpd_collaboration%{contentdir}/error -%dir /awips2/httpd_collaboration%{contentdir}/error/include -/awips2/httpd_collaboration%{contentdir}/icons/* -/awips2/httpd_collaboration%{contentdir}/error/README -/awips2/httpd_collaboration%{contentdir}/error/noindex.html -%config /awips2/httpd_collaboration%{contentdir}/error/*.var -%config /awips2/httpd_collaboration%{contentdir}/error/include/*.html - -%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/lock/subsys -%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/log/httpd -%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/run/httpd -%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/lib/dav -%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/cache/mod_proxy - -/awips2/httpd_collaboration/%{_mandir}/man1/* -/awips2/httpd_collaboration/%{_mandir}/man8/* - -%files manual -%defattr(-,root,root) -/awips2/httpd_collaboration/%{contentdir}/manual -%config /awips2/httpd_collaboration/%{_sysconfdir}/httpd/conf.d/manual.conf - -%files -n mod_ssl -%defattr(-,root,root) -/awips2/httpd_collaboration/%{_libdir}/httpd/modules/mod_ssl.so -%config(noreplace) /awips2/httpd_collaboration/%{_sysconfdir}/httpd/conf.d/ssl.conf -%attr(0700,apache,root) %dir /awips2/httpd_collaboration/%{_localstatedir}/cache/mod_ssl -%attr(0600,apache,root) %ghost /awips2/httpd_collaboration/%{_localstatedir}/cache/mod_ssl/scache.dir -%attr(0600,apache,root) %ghost /awips2/httpd_collaboration/%{_localstatedir}/cache/mod_ssl/scache.pag -%attr(0600,apache,root) %ghost /awips2/httpd_collaboration/%{_localstatedir}/cache/mod_ssl/scache.sem - -%files devel -%defattr(-,root,root) -/awips2/httpd_collaboration/%{_includedir}/httpd -/awips2/httpd_collaboration/%{_sbindir}/apxs -/awips2/httpd_collaboration/%{_mandir}/man8/apxs.8* -%dir /awips2/httpd_collaboration%{_libdir}/httpd/build -/awips2/httpd_collaboration%{_libdir}/httpd/build/*.mk -/awips2/httpd_collaboration%{_libdir}/httpd/build/*.sh - -%changelog -* Thu Oct 6 2011 Joe Orton - 2.2.15-15 -- mod_proxy_ftp: fix handling of EPSV w/IPv6 localhost (#737960) -- core: add security fix for CVE-2011-3368 (#743659) -- mod_proxy_ajp: add security fix for CVE-2011-3348 (#738961) -- mod_cache: forward-port CacheMaxExpire "hard" option (#740242) - -* Wed Sep 28 2011 Joe Orton - 2.2.15-14 -- update to byterange patch (#736592) - -* Thu Sep 8 2011 Joe Orton - 2.2.15-13 -- add security fix for CVE-2011-3192 (#733063, #736592) - -* Mon Aug 8 2011 Joe Orton - 2.2.15-12 -- mod_ssl: ignore SNI hints unless required by config (#714704) -- mod_ssl: fix segfault with bad SSLCryptoDevice argument (#729585) - -* Tue Jul 26 2011 Joe Orton - 2.2.15-11 -- rebase mod_reqtimeout to 2.2.17 (#676634) -- mod_proxy_ajp: honour ProxyErrorOverride (#694939) -- mod_ssl: add fix for handling incomplete lines w/revproxy (#700074) -- mod_filter: fix matching against non-std response headers (#700075) -- core: abort() on malloc() failure (#700393) -- mod_ssl: fix startup crash w/client cert shared across vhosts (#720980) - -* Tue Jun 7 2011 Joe Orton - 2.2.15-10 -- mod_filter: fix test against non-standard response headers (#700075) - -* Fri Apr 8 2011 Joe Orton - 2.2.15-9 -- mod_ssl: complete fix for overlapping memcpy (#652335) - -* Mon Mar 21 2011 Joe Orton - 2.2.15-8 -- mod_ssl: fix compat with FIPS-enabled OpenSSL (#684144) - -* Thu Feb 24 2011 Joe Orton - 2.2.15-7 -- mod_ldap: fix caching with per-vhost directive use (#676635) -- mod_ssl: fix startup with duplicate SSL vhost configurations (#676831) -- prefork: ensure early child exit during graceful restart (#679476) - -* Mon Jan 31 2011 Joe Orton - 2.2.15-6 -- ab: fail gracefully for OOM allocating stats structures (#645846) -- init script: use $STOP_DELAY as delay before SIGKILL of parent (#657480) -- stop multiple invocations of filter init functions (#631849) -- mod_ssl: avoid overlapping memcpy (#652335) -- mark httpd.conf as noreplace - -* Fri Aug 13 2010 Joe Orton - 2.2.15-5 -- add security fix for CVE-2010-1452 (#618193) - -* Wed Jun 23 2010 Joe Orton - 2.2.15-4 -- use init script to rotate logs (#606955) -- disable keepalive for 100-continue and error response (#606964) - -* Tue May 25 2010 Joe Orton - 2.2.15-3 -- add "Satisfy All" for .htaccess in httpd.conf (#594981) -- adjust user/group creation in %%pre (#594395) -- mod_ssl: tweak OID() evaluation of unknown exts (#594980) - -* Thu May 6 2010 Joe Orton - 2.2.15-2 -- init script fixes for LSB compliance (#546252) - * exit code 2 for an unknown script argument - * exit code 6 for a reload if config-test fails - * exit code 7 for a reload on a stopped service - * fixed help output to cover all options -- mod_dav: handle PUT failure more cleanly (#572911) - -* Thu Mar 11 2010 Joe Orton - 2.2.15-1 -- update to 2.2.15 (#570465, #570442) -- fix version string (#572140) -- mod_ssl: use ASN1_STRING_print() in SSLRequire's OID() (#552942) -- prevent use of rsync during "make install" (#557049) -- load mod_version by default in httpd.conf - -* Tue Feb 9 2010 Joe Orton - 2.2.14-5 -- mod_ssl: fix CVE-2009-3555 backport (#563119) -- mod_authnz_ldap: fix for dynamic group support -- mod_ssl: add SSLInsecureRenegotiation directive (#561435) - -* Thu Jan 14 2010 Joe Orton - 2.2.14-4 -- mod_ssl: add further mitigation for CVE-2009-3555 -- drop proxy_ajp.conf -- update httpd.conf: decrease Timeout to 1m, update LoadModule - directives, bump worker to 4 proc/300clients -- fix hard-coded default pidfile to match default config (#547629) -- drop legacy X-Pad header from short responses (#526110) -- disable keepalive for Expect: 100-continue and error response (#533407) -- mod_ext_filter: fix spurious error log output (#479463) -- mod_rewrite: don't serialize logfile access (#493023) -- fix spurious error messages on graceful restart (#233955) -- mod_ssl: fix potential hang in renegotiation (#510515) -- mod_proxy_connect: support use SSL client connection (#523594) - -* Wed Dec 9 2009 Joe Orton - 2.2.14-3 -- add 'ServerTokens Full-Release' config option (#477006) - -* Tue Dec 8 2009 Joe Orton - 2.2.14-2 -- drop distcache support - -* Thu Dec 3 2009 Joe Orton - 2.2.14-1 -- update to 2.2.14 -- relax permissions on /var/run/httpd (#495780) -- Requires(pre): httpd in mod_ssl subpackage (#543275) -- add partial security fix for CVE-2009-3555 (#533125) - -* Tue Sep 8 2009 Joe Orton 2.2.13-2 -- restart service in posttrans (#491567) - -* Fri Aug 21 2009 Tomas Mraz - 2.2.13-2 -- rebuilt with new openssl - -* Tue Aug 18 2009 Joe Orton 2.2.13-1 -- update to 2.2.13 - -* Fri Jul 24 2009 Fedora Release Engineering - 2.2.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Jun 16 2009 Joe Orton 2.2.11-9 -- build -manual as noarch - -* Tue Mar 17 2009 Joe Orton 2.2.11-8 -- fix pidfile in httpd.logrotate (thanks to Rainer Traut) -- don't build mod_mem_cache or mod_file_cache - -* Tue Feb 24 2009 Fedora Release Engineering - 2.2.11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jan 22 2009 Joe Orton 2.2.11-6 -- Require: apr-util-ldap (#471898) -- init script changes: pass pidfile to status(), use status() in - condrestart (#480602), support try-restart as alias for - condrestart -- change /etc/httpd/run symlink to have destination /var/run/httpd, - and restore "run/httpd.conf" as default PidFile (#478688) - -* Fri Jan 16 2009 Tomas Mraz 2.2.11-5 -- rebuild with new openssl - -* Sat Dec 27 2008 Robert Scheck 2.2.11-4 -- Made default configuration using /var/run/httpd for pid file - -* Thu Dec 18 2008 Joe Orton 2.2.11-3 -- update to 2.2.11 -- package new /var/run/httpd directory, and move default pidfile - location inside there - -* Tue Oct 21 2008 Joe Orton 2.2.10-2 -- update to 2.2.10 - -* Tue Jul 15 2008 Joe Orton 2.2.9-5 -- move AddTypes for SSL cert/CRL types from ssl.conf to httpd.conf (#449979) - -* Mon Jul 14 2008 Joe Orton 2.2.9-4 -- use Charset=UTF-8 in default httpd.conf (#455123) -- only enable suexec when appropriate (Jim Radford, #453697) - -* Thu Jul 10 2008 Tom "spot" Callaway 2.2.9-3 -- rebuild against new db4 4.7 - -* Tue Jul 8 2008 Joe Orton 2.2.9-2 -- update to 2.2.9 -- build event MPM too - -* Wed Jun 4 2008 Joe Orton 2.2.8-4 -- correct UserDir directive in default config (#449815) - -* Tue Feb 19 2008 Fedora Release Engineering - 2.2.8-3 -- Autorebuild for GCC 4.3 - -* Tue Jan 22 2008 Joe Orton 2.2.8-2 -- update to 2.2.8 -- drop mod_imagemap - -* Wed Dec 05 2007 Release Engineering - 2.2.6-4 - - Rebuild for openssl bump - -* Mon Sep 17 2007 Joe Orton 2.2.6-3 -- add fix for SSL library string regression (PR 43334) -- use powered-by logo from system-logos (#250676) -- preserve timestamps for installed config files - -* Fri Sep 7 2007 Joe Orton 2.2.6-2 -- update to 2.2.6 (#250757, #282761) - -* Sun Sep 2 2007 Joe Orton 2.2.4-10 -- rebuild for fixed APR - -* Wed Aug 22 2007 Joe Orton 2.2.4-9 -- rebuild for expat soname bump - -* Tue Aug 21 2007 Joe Orton 2.2.4-8 -- fix License -- require /etc/mime.types (#249223) - -* Thu Jul 26 2007 Joe Orton 2.2.4-7 -- drop -tools dependency on httpd (thanks to Matthias Saou) - -* Wed Jul 25 2007 Joe Orton 2.2.4-6 -- split out utilities into -tools subpackage, based on patch - by Jason Tibbs (#238257) - -* Tue Jul 24 2007 Joe Orton 2.2.4-5 -- spec file cleanups: provide httpd-suexec, mod_dav; - don't obsolete mod_jk; drop trailing dots from Summaries -- init script - * add LSB info header, support force-reload (#246944) - * update description - * drop 1.3 config check - * pass $pidfile to daemon and pidfile everywhere - -* Wed May 9 2007 Joe Orton 2.2.4-4 -- update welcome page branding - -* Tue Apr 3 2007 Joe Orton 2.2.4-3 -- drop old triggers, old Requires, xmlto BR -- use Requires(...) correctly -- use standard BuildRoot -- don't mark init script as config file -- trim CHANGES further - -* Mon Mar 12 2007 Joe Orton 2.2.4-2 -- update to 2.2.4 -- drop the migration guide (#223605) - -* Thu Dec 7 2006 Joe Orton 2.2.3-8 -- fix path to instdso.sh in special.mk (#217677) -- fix detection of links in "apachectl fullstatus" - -* Tue Dec 5 2006 Joe Orton 2.2.3-7 -- rebuild for libpq soname bump - -* Sat Nov 11 2006 Joe Orton 2.2.3-6 -- rebuild for BDB soname bump - -* Mon Sep 11 2006 Joe Orton 2.2.3-5 -- updated "powered by Fedora" logo (#205573, Diana Fong) -- tweak welcome page wording slightly (#205880) - -* Fri Aug 18 2006 Jesse Keating - 2.2.3-4 -- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* - (#203001) - -* Thu Aug 3 2006 Joe Orton 2.2.3-3 -- init: use killproc() delay to avoid race killing parent - -* Fri Jul 28 2006 Joe Orton 2.2.3-2 -- update to 2.2.3 -- trim %%changelog to >=2.0.52 - -* Thu Jul 20 2006 Joe Orton 2.2.2-8 -- fix segfault on dummy connection failure at graceful restart (#199429) - -* Wed Jul 19 2006 Joe Orton 2.2.2-7 -- fix "apxs -g"-generated Makefile -- fix buildconf with autoconf 2.60 - -* Wed Jul 12 2006 Jesse Keating - 2.2.2-5.1 -- rebuild - -* Wed Jun 7 2006 Joe Orton 2.2.2-5 -- require pkgconfig for -devel (#194152) -- fixes for installed support makefiles (special.mk et al) -- BR autoconf - -* Fri Jun 2 2006 Joe Orton 2.2.2-4 -- make -devel package multilib-safe (#192686) - -* Thu May 11 2006 Joe Orton 2.2.2-3 -- build DSOs using -z relro linker flag - -* Wed May 3 2006 Joe Orton 2.2.2-2 -- update to 2.2.2 - -* Thu Apr 6 2006 Joe Orton 2.2.0-6 -- rebuild to pick up apr-util LDAP interface fix (#188073) - -* Fri Feb 10 2006 Jesse Keating - (none):2.2.0-5.1.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - (none):2.2.0-5.1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Mon Feb 6 2006 Joe Orton 2.2.0-5.1 -- mod_auth_basic/mod_authn_file: if no provider is configured, - and AuthUserFile is not configured, decline to handle authn - silently rather than failing noisily. - -* Fri Feb 3 2006 Joe Orton 2.2.0-5 -- mod_ssl: add security fix for CVE-2005-3357 (#177914) -- mod_imagemap: add security fix for CVE-2005-3352 (#177913) -- add fix for AP_INIT_* designated initializers with C++ compilers -- httpd.conf: enable HTMLTable in default IndexOptions -- httpd.conf: add more "redirect-carefully" matches for DAV clients - -* Thu Jan 5 2006 Joe Orton 2.2.0-4 -- mod_proxy_ajp: fix Cookie handling (Mladen Turk, r358769) - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Dec 7 2005 Joe Orton 2.2.0-3 -- strip manual to just English content - -* Mon Dec 5 2005 Joe Orton 2.2.0-2 -- don't strip C-L from HEAD responses (Greg Ames, #110552) -- load mod_proxy_balancer by default -- add proxy_ajp.conf to load/configure mod_proxy_ajp -- Obsolete mod_jk -- update docs URLs in httpd.conf/ssl.conf - -* Fri Dec 2 2005 Joe Orton 2.2.0-1 -- update to 2.2.0 - -* Wed Nov 30 2005 Joe Orton 2.1.10-2 -- enable mod_authn_alias, mod_authn_anon -- update default httpd.conf - -* Fri Nov 25 2005 Joe Orton 2.1.10-1 -- update to 2.1.10 -- require apr >= 1.2.0, apr-util >= 1.2.0 - -* Wed Nov 9 2005 Tomas Mraz 2.0.54-16 -- rebuilt against new openssl - -* Thu Nov 3 2005 Joe Orton 2.0.54-15 -- log notice giving SELinux context at startup if enabled -- drop SSLv2 and restrict default cipher suite in default - SSL configuration - -* Thu Oct 20 2005 Joe Orton 2.0.54-14 -- mod_ssl: add security fix for SSLVerifyClient (CVE-2005-2700) -- add security fix for byterange filter DoS (CVE-2005-2728) -- add security fix for C-L vs T-E handling (CVE-2005-2088) -- mod_ssl: add security fix for CRL overflow (CVE-2005-1268) -- mod_ldap/mod_auth_ldap: add fixes from 2.0.x branch (upstream #34209 etc) -- add fix for dummy connection handling (#167425) -- mod_auth_digest: fix hostinfo comparison in CONNECT requests -- mod_include: fix variable corruption in nested includes (upstream #12655) -- mod_ssl: add fix for handling non-blocking reads -- mod_ssl: fix to enable output buffering (upstream #35279) -- mod_ssl: buffer request bodies for per-location renegotiation (upstream #12355) - -* Sat Aug 13 2005 Joe Orton 2.0.54-13 -- don't load by default: mod_cern_meta, mod_asis -- do load by default: mod_ext_filter (#165893) - -* Thu Jul 28 2005 Joe Orton 2.0.54-12 -- drop broken epoch deps - -* Thu Jun 30 2005 Joe Orton 2.0.54-11 -- mod_dav_fs: fix uninitialized variable (#162144) -- add epoch to dependencies as appropriate -- mod_ssl: drop dependencies on dev, make -- mod_ssl: mark post script dependencies as such - -* Mon May 23 2005 Joe Orton 2.0.54-10 -- remove broken symlink (Robert Scheck, #158404) - -* Wed May 18 2005 Joe Orton 2.0.54-9 -- add piped logger fixes (w/Jeff Trawick) - -* Mon May 9 2005 Joe Orton 2.0.54-8 -- drop old "powered by Red Hat" logos - -* Wed May 4 2005 Joe Orton 2.0.54-7 -- mod_userdir: fix memory allocation issue (upstream #34588) -- mod_ldap: fix memory corruption issue (Brad Nicholes, upstream #34618) - -* Tue Apr 26 2005 Joe Orton 2.0.54-6 -- fix key/cert locations in post script - -* Mon Apr 25 2005 Joe Orton 2.0.54-5 -- create default dummy cert in /etc/pki/tls -- use a pseudo-random serial number on the dummy cert -- change default ssl.conf to point at /etc/pki/tls -- merge back -suexec subpackage; SELinux policy can now be - used to persistently disable suexec (#155716) -- drop /etc/httpd/conf/ssl.* directories and Makefiles -- unconditionally enable PIE support -- mod_ssl: fix for picking up -shutdown options (upstream #34452) - -* Mon Apr 18 2005 Joe Orton 2.0.54-4 -- replace PreReq with Requires(pre) - -* Mon Apr 18 2005 Joe Orton 2.0.54-3 -- update to 2.0.54 - -* Tue Mar 29 2005 Joe Orton 2.0.53-6 -- update default httpd.conf: - * clarify the comments on AddDefaultCharset usage (#135821) - * remove all the AddCharset default extensions - * don't load mod_imap by default - * synch with upstream 2.0.53 httpd-std.conf -- mod_ssl: set user from SSLUserName in access hook (upstream #31418) -- htdigest: fix permissions of created files (upstream #33765) -- remove htsslpass - -* Wed Mar 2 2005 Joe Orton 2.0.53-5 -- apachectl: restore use of $OPTIONS again - -* Wed Feb 9 2005 Joe Orton 2.0.53-4 -- update to 2.0.53 -- move prefork/worker modules comparison to %%check - -* Mon Feb 7 2005 Joe Orton 2.0.52-7 -- fix cosmetic issues in "service httpd reload" -- move User/Group higher in httpd.conf (#146793) -- load mod_logio by default in httpd.conf -- apachectl: update for correct libselinux tools locations - -* Tue Nov 16 2004 Joe Orton 2.0.52-6 -- add security fix for CVE CAN-2004-0942 (memory consumption DoS) -- SELinux: run httpd -t under runcon in configtest (Steven Smalley) -- fix SSLSessionCache comment for distcache in ssl.conf -- restart using SIGHUP not SIGUSR1 after logrotate -- add ap_save_brigade fix (upstream #31247) -- mod_ssl: fix possible segfault in auth hook (upstream #31848) -- add htsslpass(1) and configure as default SSLPassPhraseDialog (#128677) -- apachectl: restore use of $OPTIONS -- apachectl, httpd.init: refuse to restart if $HTTPD -t fails -- apachectl: run $HTTPD -t in user SELinux context for configtest -- update for pcre-5.0 header locations - -* Sat Nov 13 2004 Jeff Johnson 2.0.52-5 -- rebuild against db-4.3.21 aware apr-util. - -* Thu Nov 11 2004 Jeff Johnson 2.0.52-4 -- rebuild against db-4.3-21. - -* Thu Sep 28 2004 Joe Orton 2.0.52-3 -- add dummy connection address fixes from HEAD -- mod_ssl: add security fix for CAN-2004-0885 - -* Tue Sep 28 2004 Joe Orton 2.0.52-2 -- update to 2.0.52 - diff --git a/rpms/awips2.core/Installer.httpd-collaboration/configuration/apache/collaboration.conf b/rpms/awips2.core/Installer.httpd-collaboration/configuration/apache/collaboration.conf deleted file mode 100644 index a769b062c9..0000000000 --- a/rpms/awips2.core/Installer.httpd-collaboration/configuration/apache/collaboration.conf +++ /dev/null @@ -1,3 +0,0 @@ - - Dav On - \ No newline at end of file diff --git a/rpms/awips2.core/Installer.httpd-collaboration/configuration/conf/httpd.conf b/rpms/awips2.core/Installer.httpd-collaboration/configuration/conf/httpd.conf deleted file mode 100644 index a447bffe96..0000000000 --- a/rpms/awips2.core/Installer.httpd-collaboration/configuration/conf/httpd.conf +++ /dev/null @@ -1,1008 +0,0 @@ -# -# This is the main Apache server configuration file. It contains the -# configuration directives that give the server its instructions. -# See for detailed information. -# In particular, see -# -# for a discussion of each configuration directive. -# -# -# Do NOT simply read the instructions in here without understanding -# what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. -# -# The configuration directives are grouped into three basic sections: -# 1. Directives that control the operation of the Apache server process as a -# whole (the 'global environment'). -# 2. Directives that define the parameters of the 'main' or 'default' server, -# which responds to requests that aren't handled by a virtual host. -# These directives also provide default values for the settings -# of all virtual hosts. -# 3. Settings for virtual hosts, which allow Web requests to be sent to -# different IP addresses or hostnames and have them handled by the -# same Apache server process. -# -# Configuration and logfile names: If the filenames you specify for many -# of the server's control files begin with "/" (or "drive:/" for Win32), the -# server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so "logs/foo.log" -# with ServerRoot set to "/etc/httpd" will be interpreted by the -# server as "/etc/httpd/logs/foo.log". -# - -### Section 1: Global Environment -# -# The directives in this section affect the overall operation of Apache, -# such as the number of concurrent requests it can handle or where it -# can find its configuration files. -# - -# -# Don't give away too much information about all the subcomponents -# we are running. Comment out this line if you don't mind remote sites -# finding out what major optional modules you are running -ServerTokens OS - -# -# ServerRoot: The top of the directory tree under which the server's -# configuration, error, and log files are kept. -# -# NOTE! If you intend to place this on an NFS (or otherwise network) -# mounted filesystem then please read the LockFile documentation -# (available at ); -# you will save yourself a lot of trouble. -# -# Do NOT add a slash at the end of the directory path. -# -ServerRoot "/awips2/httpd_collaboration/etc/httpd" - -# -# PidFile: The file in which the server should record its process -# identification number when it starts. Note the PIDFILE variable in -# /etc/sysconfig/httpd must be set appropriately if this location is -# changed. -# -PidFile run/httpd.pid - -# -# Timeout: The number of seconds before receives and sends time out. -# -Timeout 120 - -# -# KeepAlive: Whether or not to allow persistent connections (more than -# one request per connection). Set to "Off" to deactivate. -# -KeepAlive On - -# -# MaxKeepAliveRequests: The maximum number of requests to allow -# during a persistent connection. Set to 0 to allow an unlimited amount. -# We recommend you leave this number high, for maximum performance. -# -MaxKeepAliveRequests 50 - -# -# KeepAliveTimeout: Number of seconds to wait for the next request from the -# same client on the same connection. -# -KeepAliveTimeout 15 - -## -## Server-Pool Size Regulation (MPM specific) -## - -# prefork MPM -# StartServers: number of server processes to start -# MinSpareServers: minimum number of server processes which are kept spare -# MaxSpareServers: maximum number of server processes which are kept spare -# ServerLimit: maximum value for MaxClients for the lifetime of the server -# MaxClients: maximum number of server processes allowed to start -# MaxRequestsPerChild: maximum number of requests a server process serves - -StartServers 8 -MinSpareServers 5 -MaxSpareServers 20 -ServerLimit 256 -MaxClients 256 -MaxRequestsPerChild 50 - - -# worker MPM -# StartServers: initial number of server processes to start -# MaxClients: maximum number of simultaneous client connections -# MinSpareThreads: minimum number of worker threads which are kept spare -# MaxSpareThreads: maximum number of worker threads which are kept spare -# ThreadsPerChild: constant number of worker threads in each server process -# MaxRequestsPerChild: maximum number of requests a server process serves - -StartServers 2 -MaxClients 150 -MinSpareThreads 25 -MaxSpareThreads 75 -ThreadsPerChild 25 -MaxRequestsPerChild 0 - - -# -# Listen: Allows you to bind Apache to specific IP addresses and/or -# ports, in addition to the default. See also the -# directive. -# -# Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses (0.0.0.0) -# -#Listen 12.34.56.78:80 -Listen 9682 - -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# have to place corresponding `LoadModule' lines at this location so the -# directives contained in it are actually available _before_ they are used. -# Statically compiled modules (those listed by `httpd -l') do not need -# to be loaded here. -# -# Example: -# LoadModule foo_module modules/mod_foo.so -# -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule auth_digest_module modules/mod_auth_digest.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_host_module modules/mod_authz_host.so -LoadModule authz_user_module modules/mod_authz_user.so -LoadModule authz_owner_module modules/mod_authz_owner.so -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 -LoadModule include_module modules/mod_include.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule logio_module modules/mod_logio.so -LoadModule env_module modules/mod_env.so -LoadModule ext_filter_module modules/mod_ext_filter.so -LoadModule mime_magic_module modules/mod_mime_magic.so -LoadModule expires_module modules/mod_expires.so -LoadModule deflate_module modules/mod_deflate.so -LoadModule headers_module modules/mod_headers.so -LoadModule usertrack_module modules/mod_usertrack.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule mime_module modules/mod_mime.so -LoadModule dav_module modules/mod_dav.so -LoadModule status_module modules/mod_status.so -LoadModule autoindex_module modules/mod_autoindex.so -LoadModule info_module modules/mod_info.so -LoadModule dav_fs_module modules/mod_dav_fs.so -LoadModule vhost_alias_module modules/mod_vhost_alias.so -LoadModule negotiation_module modules/mod_negotiation.so -LoadModule dir_module modules/mod_dir.so -LoadModule actions_module modules/mod_actions.so -LoadModule speling_module modules/mod_speling.so -LoadModule userdir_module modules/mod_userdir.so -LoadModule alias_module modules/mod_alias.so -LoadModule substitute_module modules/mod_substitute.so -LoadModule rewrite_module modules/mod_rewrite.so -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_balancer_module modules/mod_proxy_balancer.so -LoadModule proxy_ftp_module modules/mod_proxy_ftp.so -LoadModule proxy_http_module modules/mod_proxy_http.so -LoadModule proxy_ajp_module modules/mod_proxy_ajp.so -LoadModule proxy_connect_module modules/mod_proxy_connect.so -LoadModule cache_module modules/mod_cache.so -LoadModule suexec_module modules/mod_suexec.so -LoadModule disk_cache_module modules/mod_disk_cache.so -LoadModule cgi_module modules/mod_cgi.so -LoadModule version_module modules/mod_version.so - -# -# The following modules are not loaded by default: -# -#LoadModule asis_module modules/mod_asis.so -#LoadModule authn_dbd_module modules/mod_authn_dbd.so -#LoadModule cern_meta_module modules/mod_cern_meta.so -#LoadModule cgid_module modules/mod_cgid.so -#LoadModule dbd_module modules/mod_dbd.so -#LoadModule dumpio_module modules/mod_dumpio.so -#LoadModule filter_module modules/mod_filter.so -#LoadModule ident_module modules/mod_ident.so -#LoadModule log_forensic_module modules/mod_log_forensic.so -#LoadModule unique_id_module modules/mod_unique_id.so -# - -# -# Load config files from the config directory "/etc/httpd/conf.d". -# -Include conf.d/*.conf - -# -# ExtendedStatus controls whether Apache will generate "full" status -# information (ExtendedStatus On) or just basic information (ExtendedStatus -# Off) when the "server-status" handler is called. The default is Off. -# -#ExtendedStatus On - -# -# If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. -# -# User/Group: The name (or #number) of the user/group to run httpd as. -# . On SCO (ODT 3) use "User nouser" and "Group nogroup". -# . On HPUX you may not be able to use shared memory as nobody, and the -# suggested workaround is to create a user www and use that user. -# NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET) -# when the value of (unsigned)Group is above 60000; -# don't use Group #-1 on these systems! -# -User awips -Group awips - -### Section 2: 'Main' server configuration -# -# The directives in this section set up the values used by the 'main' -# server, which responds to any requests that aren't handled by a -# definition. These values also provide defaults for -# any containers you may define later in the file. -# -# All of these directives may appear inside containers, -# in which case these default settings will be overridden for the -# virtual host being defined. -# - -# -# ServerAdmin: Your address, where problems with the server should be -# e-mailed. This address appears on some server-generated pages, such -# as error documents. e.g. admin@your-domain.com -# -ServerAdmin root@localhost - -# -# ServerName gives the name and port that the server uses to identify itself. -# This can often be determined automatically, but we recommend you specify -# it explicitly to prevent problems during startup. -# -# If this is not set to valid DNS name for your host, server-generated -# redirections will not work. See also the UseCanonicalName directive. -# -# If your host doesn't have a registered DNS name, enter its IP address here. -# You will have to access it by its address anyway, and this will make -# redirections work in a sensible way. -# -#ServerName www.example.com:80 - -# -# UseCanonicalName: Determines how Apache constructs self-referencing -# URLs and the SERVER_NAME and SERVER_PORT variables. -# When set "Off", Apache will use the Hostname and Port supplied -# by the client. When set "On", Apache will use the value of the -# ServerName directive. -# -UseCanonicalName Off - -# -# DocumentRoot: The directory out of which you will serve your -# documents. By default, all requests are taken from this directory, but -# symbolic links and aliases may be used to point to other locations. -# -DocumentRoot "/awips2/httpd_collaboration/var/www/html" - -# -# Each directory to which Apache has access can be configured with respect -# to which services and features are allowed and/or disabled in that -# directory (and its subdirectories). -# -# First, we configure the "default" to be a very restrictive set of -# features. -# - - Options FollowSymLinks - AllowOverride None - - -# -# Note that from this point forward you must specifically allow -# particular features to be enabled - so if something's not working as -# you might expect, make sure that you have specifically enabled it -# below. -# - -# -# This should be changed to whatever you set DocumentRoot to. -# - - -# -# Possible values for the Options directive are "None", "All", -# or any combination of: -# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews -# -# Note that "MultiViews" must be named *explicitly* --- "Options All" -# doesn't give it to you. -# -# The Options directive is both complicated and important. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#options -# for more information. -# - Options Indexes FollowSymLinks - -# -# AllowOverride controls what directives may be placed in .htaccess files. -# It can be "All", "None", or any combination of the keywords: -# Options FileInfo AuthConfig Limit -# - AllowOverride None - -# -# Controls who can get stuff from this server. -# - Order allow,deny - Allow from all - - - -# -# UserDir: The name of the directory that is appended onto a user's home -# directory if a ~user request is received. -# -# The path to the end user account 'public_html' directory must be -# accessible to the webserver userid. This usually means that ~userid -# must have permissions of 711, ~userid/public_html must have permissions -# of 755, and documents contained therein must be world-readable. -# Otherwise, the client will only receive a "403 Forbidden" message. -# -# See also: http://httpd.apache.org/docs/misc/FAQ.html#forbidden -# - - # - # UserDir is disabled by default since it can confirm the presence - # of a username on the system (depending on home directory - # permissions). - # - UserDir disabled - - # - # To enable requests to /~user/ to serve the user's public_html - # directory, remove the "UserDir disabled" line above, and uncomment - # the following line instead: - # - #UserDir public_html - - - -# -# Control access to UserDir directories. The following is an example -# for a site where these directories are restricted to read-only. -# -# -# AllowOverride FileInfo AuthConfig Limit -# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec -# -# Order allow,deny -# Allow from all -# -# -# Order deny,allow -# Deny from all -# -# - -# -# DirectoryIndex: sets the file that Apache will serve if a directory -# is requested. -# -# The index.html.var file (a type-map) is used to deliver content- -# negotiated documents. The MultiViews Option can be used for the -# same purpose, but it is much slower. -# -DirectoryIndex index.html index.html.var - -# -# AccessFileName: The name of the file to look for in each directory -# for additional configuration directives. See also the AllowOverride -# directive. -# -AccessFileName .htaccess - -# -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. -# - - Order allow,deny - Deny from all - - -# -# TypesConfig describes where the mime.types file (or equivalent) is -# to be found. -# -TypesConfig /etc/mime.types - -# -# DefaultType is the default MIME type the server will use for a document -# if it cannot otherwise determine one, such as from filename extensions. -# If your server contains mostly text or HTML documents, "text/plain" is -# a good value. If most of your content is binary, such as applications -# or images, you may want to use "application/octet-stream" instead to -# keep browsers from trying to display binary files as though they are -# text. -# -DefaultType text/plain - -# -# The mod_mime_magic module allows the server to use various hints from the -# contents of the file itself to determine its type. The MIMEMagicFile -# directive tells the module where the hint definitions are located. -# - -# MIMEMagicFile /usr/share/magic.mime - MIMEMagicFile conf/magic - - -# -# HostnameLookups: Log the names of clients or just their IP addresses -# e.g., www.apache.org (on) or 204.62.129.132 (off). -# The default is off because it'd be overall better for the net if people -# had to knowingly turn this feature on, since enabling it means that -# each client request will result in AT LEAST one lookup request to the -# nameserver. -# -HostnameLookups Off - -# -# EnableMMAP: Control whether memory-mapping is used to deliver -# files (assuming that the underlying OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. On some systems, turning it off (regardless of -# filesystem) can improve performance; for details, please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap -# -#EnableMMAP off - -# -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -# -#EnableSendfile off - -# -# ErrorLog: The location of the error log file. -# If you do not specify an ErrorLog directive within a -# container, error messages relating to that virtual host will be -# logged here. If you *do* define an error logfile for a -# container, that host's errors will be logged there and not here. -# -ErrorLog logs/error_log - -# -# LogLevel: Control the number of messages logged to the error_log. -# Possible values include: debug, info, notice, warn, error, crit, -# alert, emerg. -# -LogLevel warn - -# -# The following directives define some format nicknames for use with -# a CustomLog directive (see below). -# -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -# "combinedio" includes actual counts of actual bytes received (%I) and sent (%O); this -# requires the mod_logio module to be loaded. -#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio - -# -# The location and format of the access logfile (Common Logfile Format). -# If you do not define any access logfiles within a -# container, they will be logged here. Contrariwise, if you *do* -# define per- access logfiles, transactions will be -# logged therein and *not* in this file. -# -#CustomLog logs/access_log common - -# -# If you would like to have separate agent and referer logfiles, uncomment -# the following directives. -# -#CustomLog logs/referer_log referer -#CustomLog logs/agent_log agent - -# -# For a single logfile with access, agent, and referer information -# (Combined Logfile Format), use the following directive: -# -CustomLog logs/access_log combined - -# -# Optionally add a line containing the server version and virtual host -# name to server-generated pages (internal error documents, FTP directory -# listings, mod_status and mod_info output etc., but not CGI generated -# documents or custom error documents). -# Set to "EMail" to also include a mailto: link to the ServerAdmin. -# Set to one of: On | Off | EMail -# -ServerSignature On - -# -# Aliases: Add here as many aliases as you need (with no limit). The format is -# Alias fakename realname -# -# Note that if you include a trailing / on fakename then the server will -# require it to be present in the URL. So "/icons" isn't aliased in this -# example, only "/icons/". If the fakename is slash-terminated, then the -# realname must also be slash terminated, and if the fakename omits the -# trailing slash, the realname must also omit it. -# -# We include the /icons/ alias for FancyIndexed directory listings. If you -# do not use FancyIndexing, you may comment this out. -# -Alias /icons/ "/awips2/httpd_collaboration/var/www/icons/" - - - Options Indexes MultiViews - AllowOverride None - Order allow,deny - Allow from all - - -# -# WebDAV module configuration section. -# - - # Location of the WebDAV lock database. - DAVLockDB /awips2/httpd_collaboration/dav/lockdb - - -# -# ScriptAlias: This controls which directories contain server scripts. -# ScriptAliases are essentially the same as Aliases, except that -# documents in the realname directory are treated as applications and -# run by the server when requested rather than as documents sent to the client. -# The same rules about trailing "/" apply to ScriptAlias directives as to -# Alias. -# -ScriptAlias /cgi-bin/ "/awips2/httpd_collaboration/var/www/cgi-bin/" - -# -# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased -# CGI directory exists, if you have that configured. -# - - AllowOverride None - Options None - Order allow,deny - Allow from all - - -# -# Redirect allows you to tell clients about documents which used to exist in -# your server's namespace, but do not anymore. This allows you to tell the -# clients where to look for the relocated document. -# Example: -# Redirect permanent /foo http://www.example.com/bar - -# -# Directives controlling the display of server-generated directory listings. -# - -# -# IndexOptions: Controls the appearance of server-generated directory -# listings. -# -IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8 - -# -# AddIcon* directives tell the server which icon to show for different -# files or filename extensions. These are only displayed for -# FancyIndexed directories. -# -AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip - -AddIconByType (TXT,/icons/text.gif) text/* -AddIconByType (IMG,/icons/image2.gif) image/* -AddIconByType (SND,/icons/sound2.gif) audio/* -AddIconByType (VID,/icons/movie.gif) video/* - -AddIcon /icons/binary.gif .bin .exe -AddIcon /icons/binhex.gif .hqx -AddIcon /icons/tar.gif .tar -AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv -AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip -AddIcon /icons/a.gif .ps .ai .eps -AddIcon /icons/layout.gif .html .shtml .htm .pdf -AddIcon /icons/text.gif .txt -AddIcon /icons/c.gif .c -AddIcon /icons/p.gif .pl .py -AddIcon /icons/f.gif .for -AddIcon /icons/dvi.gif .dvi -AddIcon /icons/uuencoded.gif .uu -AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl -AddIcon /icons/tex.gif .tex -AddIcon /icons/bomb.gif core - -AddIcon /icons/back.gif .. -AddIcon /icons/hand.right.gif README -AddIcon /icons/folder.gif ^^DIRECTORY^^ -AddIcon /icons/blank.gif ^^BLANKICON^^ - -# -# DefaultIcon is which icon to show for files which do not have an icon -# explicitly set. -# -DefaultIcon /icons/unknown.gif - -# -# AddDescription allows you to place a short description after a file in -# server-generated indexes. These are only displayed for FancyIndexed -# directories. -# Format: AddDescription "description" filename -# -#AddDescription "GZIP compressed document" .gz -#AddDescription "tar archive" .tar -#AddDescription "GZIP compressed tar archive" .tgz - -# -# ReadmeName is the name of the README file the server will look for by -# default, and append to directory listings. -# -# HeaderName is the name of a file which should be prepended to -# directory indexes. -ReadmeName README.html -HeaderName HEADER.html - -# -# IndexIgnore is a set of filenames which directory indexing should ignore -# and not include in the listing. Shell-style wildcarding is permitted. -# -IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t - -# -# DefaultLanguage and AddLanguage allows you to specify the language of -# a document. You can then use content negotiation to give a browser a -# file in a language the user can understand. -# -# Specify a default language. This means that all data -# going out without a specific language tag (see below) will -# be marked with this one. You probably do NOT want to set -# this unless you are sure it is correct for all cases. -# -# * It is generally better to not mark a page as -# * being a certain language than marking it with the wrong -# * language! -# -# DefaultLanguage nl -# -# Note 1: The suffix does not have to be the same as the language -# keyword --- those with documents in Polish (whose net-standard -# language code is pl) may wish to use "AddLanguage pl .po" to -# avoid the ambiguity with the common suffix for perl scripts. -# -# Note 2: The example entries below illustrate that in some cases -# the two character 'Language' abbreviation is not identical to -# the two character 'Country' code for its country, -# E.g. 'Danmark/dk' versus 'Danish/da'. -# -# Note 3: In the case of 'ltz' we violate the RFC by using a three char -# specifier. There is 'work in progress' to fix this and get -# the reference data for rfc1766 cleaned up. -# -# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) -# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) -# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) -# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) -# Norwegian (no) - Polish (pl) - Portugese (pt) -# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) -# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) -# -AddLanguage ca .ca -AddLanguage cs .cz .cs -AddLanguage da .dk -AddLanguage de .de -AddLanguage el .el -AddLanguage en .en -AddLanguage eo .eo -AddLanguage es .es -AddLanguage et .et -AddLanguage fr .fr -AddLanguage he .he -AddLanguage hr .hr -AddLanguage it .it -AddLanguage ja .ja -AddLanguage ko .ko -AddLanguage ltz .ltz -AddLanguage nl .nl -AddLanguage nn .nn -AddLanguage no .no -AddLanguage pl .po -AddLanguage pt .pt -AddLanguage pt-BR .pt-br -AddLanguage ru .ru -AddLanguage sv .sv -AddLanguage zh-CN .zh-cn -AddLanguage zh-TW .zh-tw - -# -# LanguagePriority allows you to give precedence to some languages -# in case of a tie during content negotiation. -# -# Just list the languages in decreasing order of preference. We have -# more or less alphabetized them here. You probably want to change this. -# -LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW - -# -# ForceLanguagePriority allows you to serve a result page rather than -# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) -# [in case no accepted languages matched the available variants] -# -ForceLanguagePriority Prefer Fallback - -# -# Specify a default charset for all content served; this enables -# interpretation of all content as UTF-8 by default. To use the -# default browser choice (ISO-8859-1), or to allow the META tags -# in HTML content to override this choice, comment out this -# directive: -# -AddDefaultCharset UTF-8 - -# -# AddType allows you to add to or override the MIME configuration -# file mime.types for specific file types. -# -#AddType application/x-tar .tgz - -# -# AddEncoding allows you to have certain browsers uncompress -# information on the fly. Note: Not all browsers support this. -# Despite the name similarity, the following Add* directives have nothing -# to do with the FancyIndexing customization directives above. -# -#AddEncoding x-compress .Z -#AddEncoding x-gzip .gz .tgz - -# If the AddEncoding directives above are commented-out, then you -# probably should define those extensions to indicate media types: -# -AddType application/x-compress .Z -AddType application/x-gzip .gz .tgz - -# -# MIME-types for downloading Certificates and CRLs -# -AddType application/x-x509-ca-cert .crt -AddType application/x-pkcs7-crl .crl - -# -# AddHandler allows you to map certain file extensions to "handlers": -# actions unrelated to filetype. These can be either built into the server -# or added with the Action directive (see below) -# -# To use CGI scripts outside of ScriptAliased directories: -# (You will also need to add "ExecCGI" to the "Options" directive.) -# -#AddHandler cgi-script .cgi - -# -# For files that include their own HTTP headers: -# -#AddHandler send-as-is asis - -# -# For type maps (negotiated resources): -# (This is enabled by default to allow the Apache "It Worked" page -# to be distributed in multiple languages.) -# -AddHandler type-map var - -# -# Filters allow you to process content before it is sent to the client. -# -# To parse .shtml files for server-side includes (SSI): -# (You will also need to add "Includes" to the "Options" directive.) -# -AddType text/html .shtml -AddOutputFilter INCLUDES .shtml - -# -# Action lets you define media types that will execute a script whenever -# a matching file is called. This eliminates the need for repeated URL -# pathnames for oft-used CGI file processors. -# Format: Action media/type /cgi-script/location -# Format: Action handler-name /cgi-script/location -# - -# -# Customizable error responses come in three flavors: -# 1) plain text 2) local redirects 3) external redirects -# -# Some examples: -#ErrorDocument 500 "The server made a boo boo." -#ErrorDocument 404 /missing.html -#ErrorDocument 404 "/cgi-bin/missing_handler.pl" -#ErrorDocument 402 http://www.example.com/subscription_info.html -# - -# -# Putting this all together, we can internationalize error responses. -# -# We use Alias to redirect any /error/HTTP_.html.var response to -# our collection of by-error message multi-language collections. We use -# includes to substitute the appropriate text. -# -# You can modify the messages' appearance without changing any of the -# default HTTP_.html.var files by adding the line: -# -# Alias /error/include/ "/your/include/path/" -# -# which allows you to create your own set of files by starting with the -# /var/www/error/include/ files and -# copying them to /your/include/path/, even on a per-VirtualHost basis. -# - -Alias /error/ "/awips2/httpd_collaboration/var/www/error/" - - - - - AllowOverride None - Options IncludesNoExec - AddOutputFilter Includes html - AddHandler type-map var - Order allow,deny - Allow from all - LanguagePriority en es de fr - ForceLanguagePriority Prefer Fallback - - -# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var -# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var -# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var -# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var -# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var -# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var -# ErrorDocument 410 /error/HTTP_GONE.html.var -# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var -# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var -# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var -# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var -# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var -# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var -# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var -# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var -# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var -# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var - - - - -# -# The following directives modify normal HTTP response behavior to -# handle known problems with browser implementations. -# -BrowserMatch "Mozilla/2" nokeepalive -BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 -BrowserMatch "RealPlayer 4\.0" force-response-1.0 -BrowserMatch "Java/1\.0" force-response-1.0 -BrowserMatch "JDK/1\.0" force-response-1.0 - -# -# The following directive disables redirects on non-GET requests for -# a directory that does not include the trailing slash. This fixes a -# problem with Microsoft WebFolders which does not appropriately handle -# redirects for folders with DAV methods. -# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. -# -BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully -BrowserMatch "MS FrontPage" redirect-carefully -BrowserMatch "^WebDrive" redirect-carefully -BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully -BrowserMatch "^gnome-vfs/1.0" redirect-carefully -BrowserMatch "^XML Spy" redirect-carefully -BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully - -# -# Allow server status reports generated by mod_status, -# with the URL of http://servername/server-status -# Change the ".example.com" to match your domain to enable. -# -# -# SetHandler server-status -# Order deny,allow -# Deny from all -# Allow from .example.com -# - -# -# Allow remote server configuration reports, with the URL of -# http://servername/server-info (requires that mod_info.c be loaded). -# Change the ".example.com" to match your domain to enable. -# -# -# SetHandler server-info -# Order deny,allow -# Deny from all -# Allow from .example.com -# - -# -# Proxy Server directives. Uncomment the following lines to -# enable the proxy server: -# -# -#ProxyRequests On -# -# -# Order deny,allow -# Deny from all -# Allow from .example.com -# - -# -# Enable/disable the handling of HTTP/1.1 "Via:" headers. -# ("Full" adds the server version; "Block" removes all outgoing Via: headers) -# Set to one of: Off | On | Full | Block -# -#ProxyVia On - -# -# To enable a cache of proxied content, uncomment the following lines. -# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details. -# -# -# CacheEnable disk / -# CacheRoot "/var/cache/mod_proxy" -# -# - -# -# End of proxy directives. - -### Section 3: Virtual Hosts -# -# VirtualHost: If you want to maintain multiple domains/hostnames on your -# machine you can setup VirtualHost containers for them. Most configurations -# use only name-based virtual hosts so the server doesn't need to worry about -# IP addresses. This is indicated by the asterisks in the directives below. -# -# Please see the documentation at -# -# for further details before you try to setup virtual hosts. -# -# You may use the command line option '-S' to verify your virtual host -# configuration. - -# -# Use name-based virtual hosting. -# -#NameVirtualHost *:80 -# -# NOTE: NameVirtualHost cannot be used without a port specifier -# (e.g. :80) if mod_ssl is being used, due to the nature of the -# SSL protocol. -# - -# -# VirtualHost example: -# Almost any Apache directive may go into a VirtualHost container. -# The first VirtualHost section is used for requests without a known -# server name. -# -# -# ServerAdmin webmaster@dummy-host.example.com -# DocumentRoot /www/docs/dummy-host.example.com -# ServerName dummy-host.example.com -# ErrorLog logs/dummy-host.example.com-error_log -# CustomLog logs/dummy-host.example.com-access_log common -# diff --git a/rpms/awips2.core/Installer.httpd-collaboration/configuration/etc/init.d/httpd-collaboration b/rpms/awips2.core/Installer.httpd-collaboration/configuration/etc/init.d/httpd-collaboration deleted file mode 100644 index aa9b80caaf..0000000000 --- a/rpms/awips2.core/Installer.httpd-collaboration/configuration/etc/init.d/httpd-collaboration +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/bash -# -# httpd Startup script for the Apache HTTP Server used by Collaboration -# -# chkconfig: - 85 15 -# description: Apache is a World Wide Web server. It is used to serve \ -# HTML files and CGI. -# processname: httpd -# config: /etc/httpd/conf/httpd.conf -# config: /etc/sysconfig/httpd -# pidfile: /var/run/httpd.pid - -# Source function library. -. /etc/rc.d/init.d/functions - -if [ -f /etc/sysconfig/httpd ]; then - . /etc/sysconfig/httpd -fi - -# Start httpd in the C locale by default. -HTTPD_LANG=${HTTPD_LANG-"C"} - -# This will prevent initlog from swallowing up a pass-phrase prompt if -# mod_ssl needs a pass-phrase from the user. -INITLOG_ARGS="" - -# Set HTTPD=/usr/sbin/httpd.worker in /etc/sysconfig/httpd to use a server -# with the thread-based "worker" MPM; BE WARNED that some modules may not -# work correctly with a thread-based MPM; notably PHP will refuse to start. - -HTTPD_COLLABORATION_INSTALL="/awips2/httpd_collaboration" - -# Path to the apachectl script, server binary, and short-form for messages. -apachectl=${HTTPD_COLLABORATION_INSTALL}/usr/sbin/apachectl -httpd=${HTTPD-${HTTPD_COLLABORATION_INSTALL}/usr/sbin/httpd} -prog=httpd -pidfile=${PIDFILE-${HTTPD_COLLABORATION_INSTALL}/var/run/httpd.pid} -lockfile=${LOCKFILE-${HTTPD_COLLABORATION_INSTALL}/var/lock/subsys/httpd} -RETVAL=0 -PYTHON_INSTALL="/awips2/python" - -# Add to LD_LIBRARY_PATH, if necessary. -PYTHON_LIB_DIR="${PYTHON_INSTALL}/lib" - -# Determine if LD_LIBRARY_PATH needs to be updated. -echo $LD_LIBRARY_PATH | grep "${PYTHON_LIB_DIR}" > /dev/null 2>&1 -RC="$?" -if [ ! "${RC}" = "0" ]; then - export LD_LIBRARY_PATH=${PYTHON_LIB_DIR}:$LD_LIBRARY_PATH -fi - -# check for 1.3 configuration -check13 () { - CONFFILE=${HTTPD_COLLABORATION_INSTALL}/etc/httpd/conf/httpd.conf - GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|" - GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|" - GONE="${GONE}AccessConfig|ResourceConfig)" - if LANG=C grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then - echo - echo 1>&2 " Apache 1.3 configuration directives found" - echo 1>&2 " please read /usr/share/doc/awips2-collaboration-2.2.3/migration.html" - failure "Apache 1.3 config directives test" - echo - exit 1 - fi -} - -# The semantics of these two functions differ from the way apachectl does -# things -- attempting to start while running is a failure, and shutdown -# when not running is also a failure. So we just do it the way init scripts -# are expected to behave here. -start() { - echo -n $"Starting $prog: " - check13 || exit 1 - LANG=$HTTPD_LANG daemon $httpd $OPTIONS -f \ - ${HTTPD_COLLABORATION_INSTALL}/etc/httpd/conf/httpd.conf - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL -} - -# When stopping httpd a delay of >10 second is required before SIGKILLing the -# httpd parent; this gives enough time for the httpd parent to SIGKILL any -# errant children. -stop() { - echo -n $"Stopping $prog: " - killproc -d 10 $httpd - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} - echo -} -reload() { - echo -n $"Reloading $prog: " - if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then - RETVAL=$? - echo $"not reloading due to configuration syntax error" - failure $"not reloading $httpd due to configuration syntax error" - else - killproc $httpd -HUP - RETVAL=$? - fi - echo -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $httpd - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f ${pidfile} ] ; then - stop - start - fi - ;; - reload) - reload - ;; - graceful|help|configtest|fullstatus) - $apachectl $@ - RETVAL=$? - ;; - *) - echo $"Usage: $prog {start|stop|restart|condrestart|reload|status|fullstatus|graceful|help|configtest}" - exit 1 -esac - -exit $RETVAL \ No newline at end of file diff --git a/rpms/awips2.core/Installer.xmpp/component.spec b/rpms/awips2.core/Installer.xmpp/component.spec index 63b6dfa77a..c892f859c3 100644 --- a/rpms/awips2.core/Installer.xmpp/component.spec +++ b/rpms/awips2.core/Installer.xmpp/component.spec @@ -24,7 +24,7 @@ Packager: Bryan Kowal AutoReq: no requires: awips2-java -requires: awips2-httpd-collaboration +requires: awips2-collab-dataserver provides: awips2-%{_xmpp_server} %description diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh index 6629a66ae8..e2cfb23cdb 100644 --- a/rpms/build/common/lookupRPM.sh +++ b/rpms/build/common/lookupRPM.sh @@ -249,8 +249,8 @@ function lookupRPM() export RPM_SPECIFICATION="${awips2_core_dir}/Installer.xmpp" return 0 fi - if [ "${1}" = "awips2-httpd-collaboration" ]; then - export RPM_SPECIFICATION="${awips2_core_dir}/Installer.httpd-collaboration" + if [ "${1}" = "awips2-collab-dataserver" ]; then + export RPM_SPECIFICATION="${awips2_core_dir}/Installer.collab-dataserver" return 0 fi diff --git a/rpms/build/i386/build.sh b/rpms/build/i386/build.sh index 1d2eca82d3..04fa0f6ad9 100644 --- a/rpms/build/i386/build.sh +++ b/rpms/build/i386/build.sh @@ -272,7 +272,7 @@ if [ "${1}" = "-full" ]; then buildRPM "awips2-tools" buildRPM "awips2-edex-environment" buildRPM "awips2-openfire" - buildRPM "awips2-httpd-collaboration" + buildRPM "awips2-collab-dataserver" buildRPM "awips2-python-shapely" exit 0 diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh index 3a6bbf9ed7..7bd23abd39 100644 --- a/rpms/build/x86_64/build.sh +++ b/rpms/build/x86_64/build.sh @@ -171,7 +171,7 @@ if [ "${1}" = "-rh6" ]; then exit 1 fi buildRPM "awips2-httpd-pypies" - buildRPM "awips2-httpd-collaboration" + buildRPM "awips2-collab-dataserver" buildQPID if [ $? -ne 0 ]; then exit 1