Changes - j0ke.net Open Build Service

Changes of Revision 17

[-] [+]	Changed	vhcs2.spec
@@ -25,11 +25,15 @@ %define _vhcsroot srv/www %define _disttag suse %define _distversion %{suse_version} +%define apa apache2 +%define apa_vh_dir vhosts.d %endif %if 0%{?centos_version} \|\| 0%{?fedora_version} %define vhcsroot /var/www %define _vhcsroot var/www +%define apa httpd +%define apa_vh_dir conf.d %if 0%{?centos_version} %define _disttag centos @@ -232,8 +236,8 @@ %dir /etc/vhcs2/courier/working %dir /etc/vhcs2/proftpd %dir /etc/vhcs2/proftpd/backup -%dir /etc/apache2 -%dir /etc/apache2/vhosts.d +%dir /etc/%{apa} +%dir /etc/%{apa}/%{apa_vh_dir} %dir /etc/init.d %dir /etc/postfix %dir /etc/postfix/vhcs2 @@ -243,8 +247,8 @@ %dir /var/log %dir /var/log/vhcs2 %dir /var/log/vhcs2/vhcs2-arpl-msgr -%dir /var/log/apache2 -%dir /var/log/apache2/backup +%dir /var/log/%{apa} +%dir /var/log/%{apa}/backup %dir /var/mail/virtual %dir /var/spool/postfix/etc %dir /usr @@ -267,7 +271,7 @@ %config(noreplace) /etc/vhcs2/postfix/master.cf %config(noreplace) /etc/vhcs2/proftpd/proftpd.conf %config(noreplace) /etc/vhcs2/vhcs2.conf -%config(noreplace) /etc/apache2/vhosts.d/vhcs2.conf +%config(noreplace) /etc/%{apa}/%{apa_vh_dir}/vhcs2.conf %config(noreplace) /etc/named.d/named.conf %config(noreplace) /etc/vhcs2/bind/parts/db_sub_entry_b.tpl %config(noreplace) /etc/vhcs2/bind/parts/db_sub_entry_e.tpl @@ -342,7 +346,7 @@ /etc/init.d/vhcs2_daemon /etc/init.d/vhcs2_network /etc/logrotate.d/vhcs2 -/etc/cron.d/vhcs2.phptemp +/etc/cron.d/vhcs2phptemp %config(noreplace) /etc/postfix/vhcs2/aliases %config(noreplace) /etc/postfix/vhcs2/domains %config(noreplace) /etc/postfix/vhcs2/mailboxes