From 83e8de637d8e026b5ac82ae4cc76e92009a85f98 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 3 Feb 2015 12:37:39 +0000 Subject: [PATCH] - kill systemd infestation --- apache.service | 18 ------------------ apache.spec | 31 +++---------------------------- apache.tmpfiles | 1 - 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 apache.service delete mode 100644 apache.tmpfiles diff --git a/apache.service b/apache.service deleted file mode 100644 index 26fee96..0000000 --- a/apache.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=The Apache HTTP Server -After=syslog.target network.target remote-fs.target nss-lookup.target - -[Service] -Type=forking -PIDFile=/var/run/httpd.pid -EnvironmentFile=/etc/sysconfig/httpd -ExecStartPre=/bin/sh -c '/usr/bin/test -f "${HTTPD_CONF}" -o -d "${HTTPD_CONF}" || (echo "${HTTPD_CONF} is not file or directory"; exit 1)' -ExecStartPre=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -t -ExecStart=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -k start -ExecReload=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -t -ExecReload=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -k graceful -ExecStop=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -k stop -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/apache.spec b/apache.spec index 49f4789..4a8fed8 100644 --- a/apache.spec +++ b/apache.spec @@ -35,7 +35,7 @@ Summary(ru.UTF-8): Самый популярный веб-сервер Summary(tr.UTF-8): Lider WWW tarayıcı Name: apache Version: 2.4.12 -Release: 1 +Release: 2 License: Apache v2.0 Group: Networking/Daemons/HTTP Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -69,8 +69,6 @@ Source26: %{name}-mod_log_config.conf Source27: %{name}-mod_mime_magic.conf Source28: %{name}-mod_cache.conf Source29: %{name}-example.net.conf -Source30: %{name}.tmpfiles -Source31: %{name}.service Patch0: %{name}-configdir_skip_backups.patch Patch1: %{name}-layout.patch Patch2: %{name}-suexec.patch @@ -187,13 +185,11 @@ Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires(post,preun,postun): systemd-units >= 38 Requires: /sbin/chkconfig Requires: apr >= %{apr_ver} Requires: psmisc >= 20.1 Requires: rc-scripts >= 0.4.1.23 Requires: sed >= 4.0 -Requires: systemd-units >= 38 Provides: apache(modules-api) = %{_apache_modules_api} Provides: group(http) Provides: user(http) @@ -2669,12 +2665,10 @@ install -d build; cd build %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,systemd/system} \ +install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \ $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \ - $RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts} \ - $RPM_BUILD_ROOT%{systemdtmpfilesdir} \ - $RPM_BUILD_ROOT%{systemdunitdir} + $RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts} %{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT @@ -2682,8 +2676,6 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,systemd/system # clean "ccache" prefix. confuses other build systems (like php) %{__sed} -i -re '/^(CC|CPP|CXX)/ s/ccache //' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/config_vars.mk -install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/httpd.service -ln -s %{systemdunitdir}/httpd.service $RPM_BUILD_ROOT/etc/systemd/system/httpd.service ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules ln -s %{_localstatedir}/run/httpd $RPM_BUILD_ROOT%{_sysconfdir}/run ln -s %{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs @@ -2731,8 +2723,6 @@ cp -a %{SOURCE21} $CFG/10_mpm.conf cp -a %{SOURCE22} $CFG/20_languages.conf cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf -install %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf - echo "LoadModule access_compat_module modules/mod_access_compat.so" > $CFG/00_mod_access_compat.conf echo "LoadModule actions_module modules/mod_actions.so" > $CFG/00_mod_actions.conf echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf @@ -2894,21 +2884,18 @@ exit 0 /sbin/chkconfig --add httpd umask 137 touch /var/log/httpd/{access,error,agent,referer}_log -%systemd_post httpd.service %preun base if [ "$1" = "0" ]; then %service httpd stop /sbin/chkconfig --del httpd fi -%systemd_preun httpd.service %postun base if [ "$1" = "0" ]; then %userremove http %groupremove http fi -%systemd_reload %triggerpostun base -- %{name} < 2.0.50-6.9 %banner %{name}-2.0.50-6 << EOF @@ -3013,7 +3000,6 @@ EOF if [ -z "$HTTPD_CONF" ]; then echo 'HTTPD_CONF="/etc/httpd/apache.conf"' >> /etc/sysconfig/httpd fi -%systemd_trigger httpd.service %triggerpostun base -- %{name} < 2.4.0 cp -f /etc/httpd/apache.conf{,.rpmsave} @@ -3056,20 +3042,17 @@ mv -f /var/lock/subsys/httpd{.disabled,} 2>/dev/null # restart webserver at the end of transaction %service httpd restart -%systemd_service_restart httpd.service # macro called at module post scriptlet %define module_post \ if [ "$1" = "1" ]; then \ %service -q httpd restart \ - %systemd_service_restart httpd.service \ fi # macro called at module postun scriptlet %define module_postun \ if [ "$1" = "0" ]; then \ %service -q httpd restart \ - %systemd_service_restart httpd.service \ fi # it's sooo annoying to write them @@ -3178,25 +3161,21 @@ fi %post cgi_test if [ "$1" = "1" ]; then %service -q httpd reload - %systemd_service_reload httpd.service fi %postun cgi_test if [ "$1" = "0" ]; then %service -q httpd reload - %systemd_service_reload httpd.service fi %post errordocs if [ "$1" = "1" ]; then %service -q httpd reload - %systemd_service_reload httpd.service fi %postun errordocs if [ "$1" = "0" ]; then %service -q httpd reload - %systemd_service_reload httpd.service fi %files @@ -3231,10 +3210,6 @@ fi %dir %attr(770,root,http) /var/run/httpd %dir %attr(770,root,http) /var/cache/httpd -%{systemdtmpfilesdir}/%{name}.conf -%{systemdunitdir}/httpd.service -%config(noreplace) %verify(not md5 mtime size) /etc/systemd/system/httpd.service - %{_mandir}/man8/httpd.8* %attr(2751,root,logs) %dir /var/log/httpd diff --git a/apache.tmpfiles b/apache.tmpfiles deleted file mode 100644 index 28f7547..0000000 --- a/apache.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/run/httpd 0770 root http - -- 2.46.0