- monit file for apache1

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index f141f3904fe067272cfa55ef400b669dfb78b53e..3ed2ecf70c80bda77dd2498e6c0dd120c154decb 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -27,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
 Version:       1.3.31
-Release:       3
+Release:       5
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -40,6 +40,7 @@ Source4:      %{name}.sysconfig
 Source5:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/apache-non-english-man-pages.tar.bz2
 # Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e
 Source6:       %{name}-httpd.conf
+Source7:       %{name}.monitrc
 Source8:       %{name}-mod_vhost_alias.conf
 Source9:       %{name}-mod_status.conf
 Source10:      %{name}-mod_proxy.conf
@@ -69,6 +70,7 @@ URL:          http://www.apache.org/
 BuildRequires: db-devel >= 4.1
 BuildRequires: mm-devel >= 1.3.0
 %{?with_rewrite_ldap:BuildRequires:    openldap-devel}
+BuildRequires: rpmbuild(macros) >= 1.159
 PreReq:                mm
 PreReq:                perl-base
 PreReq:                rc-scripts
@@ -83,18 +85,17 @@ Requires(post,preun):       /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires:      /etc/mime.types
+Requires:      %{name}-apxs = %{version}-%{release}
 Requires:      mailcap
 Requires:      psmisc >= 20.1
-Requires:      %{name}-apxs = %{version}-%{release}
 Provides:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache(EAPI) = %{version}-%{release}
-Provides:      apache = %{version}-%{release}
+Provides:      group(http)
 Provides:      httpd
-Provides:      webserver
+Provides:      user(http)
+Provides:      webserver = apache
 Obsoletes:     apache < 2.0.0
 Obsoletes:     apache-extra
 Obsoletes:     apache6
-Obsoletes:     webserver
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/apache
@@ -204,7 +205,6 @@ Summary(ru):        Apache suEXEC CGI wrapper
 Summary(uk):   Apache suEXEC CGI wrapper
 Group:         Development/Tools
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-suexec = %{version}-%{release}
 Obsoletes:     apache-suexec < 2.0.0
 
 %description suexec
@@ -313,7 +313,6 @@ Group:              Networking/Utilities
 Requires:      %{name}-apxs = %{version}-%{release}
 Provides:      %{name}(EAPI)-devel = %{version}-%{release}
 Provides:      apache(EAPI)-devel = %{version}-%{release}
-Provides:      apache-devel = %{version}-%{release}
 Obsoletes:     apache-devel < 2.0.0
 
 %description devel
@@ -374,7 +373,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_actions = %{version}-%{release}
 Obsoletes:     apache-mod_actions < 2.0.0
 
 %description mod_actions
@@ -392,7 +390,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_auth = %{version}-%{release}
 Obsoletes:     apache-mod_auth < 2.0.0
 
 %description mod_auth
@@ -409,7 +406,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_auth_anon = %{version}-%{release}
 Obsoletes:     apache-mod_auth_anon < 2.0.0
 
 %description mod_auth_anon
@@ -436,7 +432,6 @@ Group:              Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Requires:      %{apxs}
-Provides:      apache-mod_auth_db = %{version}-%{release}
 Obsoletes:     apache-mod_auth_db < 2.0.0
 
 %description mod_auth_db
@@ -455,7 +450,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_auth_digest = %{version}-%{release}
 Obsoletes:     %{name}-mod_digest
 Obsoletes:     apache-mod_auth_digest < 2.0.0
 
@@ -473,7 +467,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_define = %{version}-%{release}
 Obsoletes:     apache-mod_define < 2.0.0
 
 %description mod_define
@@ -489,7 +482,6 @@ Summary(pl):        Starsza wersja modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_digest = %{version}-%{release}
 Obsoletes:     apache-mod_digest < 2.0.0
 
 %description mod_digest
@@ -513,7 +505,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_dir = %{version}-%{release}
 Obsoletes:     apache-mod_dir < 2.0.0
 
 %description mod_dir
@@ -529,7 +520,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_expires = %{version}-%{release}
 Obsoletes:     apache-mod_expires < 2.0.0
 
 %description mod_expires
@@ -549,7 +539,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_headers = %{version}-%{release}
 Obsoletes:     apache-mod_headers < 2.0.0
 
 %description mod_headers
@@ -567,7 +556,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_imap = %{version}-%{release}
 Obsoletes:     apache-mod_imap < 2.0.0
 
 %description mod_imap
@@ -584,7 +572,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_info = %{version}-%{release}
 Obsoletes:     apache-mod_info < 2.0.0
 
 %description mod_info
@@ -602,7 +589,6 @@ Summary:    Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_log_forensic = %{version}-%{release}
 Obsoletes:     apache-mod_log_forensic < 2.0.0
 
 %description mod_log_forensic
@@ -619,7 +605,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_mmap_static = %{version}-%{release}
 Obsoletes:     apache-mod_mmap_static < 2.0.0
 
 %description mod_mmap_static
@@ -640,7 +625,6 @@ Requires(post,preun):       %{apxs}
 Requires(post,preun):  grep
 Requires(preun):       fileutils
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_proxy = %{version}-%{release}
 Obsoletes:     apache-mod_proxy < 2.0.0
 
 %description mod_proxy
@@ -660,7 +644,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_rewrite = %{version}-%{release}
 Obsoletes:     apache-mod_rewrite < 2.0.0
 
 %description mod_rewrite
@@ -679,7 +662,6 @@ Requires(post,preun):       %{apxs}
 Requires(post,preun):  grep
 Requires(preun):       fileutils
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_status = %{version}-%{release}
 Obsoletes:     apache-mod_status < 2.0.0
 
 %description mod_status
@@ -699,7 +681,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_unique_id = %{version}-%{release}
 Obsoletes:     apache-mod_unique_id < 2.0.0
 
 %description mod_unique_id
@@ -723,7 +704,6 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_usertrack = %{version}-%{release}
 Obsoletes:     apache-mod_usertrack < 2.0.0
 
 %description mod_usertrack
@@ -745,7 +725,6 @@ Requires(post,preun):       %{apxs}
 Requires(post,preun):  grep
 Requires(preun):       fileutils
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Provides:      apache-mod_vhost_alias = %{version}-%{release}
 Obsoletes:     apache-mod_vhost_alias < 2.0.0
 
 %description mod_vhost_alias
@@ -824,7 +803,7 @@ rm -f src/modules/standard/mod_rewrite.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \
        $RPM_BUILD_ROOT%{_datadir}/errordocs \
        $RPM_BUILD_ROOT/var/{log/{apache,archiv/apache},run/apache}
 
@@ -846,6 +825,7 @@ install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mod_vhost_alias.conf
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.conf
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/mod_proxy.conf
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/monit
 
 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
 
@@ -934,10 +914,8 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-       echo "Removing user http."
-       /usr/sbin/userdel http
-       echo "Removing group http."
-       /usr/sbin/groupdel http
+       %userremove http
+       %groupremove http
 fi
 
 %triggerpostun -- apache < 2.0.0
@@ -1394,6 +1372,7 @@ fi
 
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*
 %attr(640,root,root) %config(noreplace) /etc/logrotate.d/*
+%attr(750,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/monit/*.monitrc
 
 %dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/mod_access.so