- migrate to apache 2.4

- rel 3

diff --git a/eventum-httpd.conf b/eventum-httpd.conf
new file mode 100644 (file)
index 0000000..2dbd46b
--- /dev/null
+++ b/eventum-httpd.conf
@@ -0,0 +1,47 @@
+# Eventum is under /eventum
+Alias /eventum /usr/share/eventum/htdocs
+
+# Eventum is running under VirtualHost
+#<VirtualHost *:80>
+#      ServerName eventum.example.org
+#      DocumentRoot /usr/share/eventum/htdocs
+#</VirtualHost>
+
+#<VirtualHost *:443>
+#      ServerName eventum.example.org
+#      DocumentRoot /usr/share/eventum/htdocs
+#</VirtualHost>
+
+<Directory /usr/share/eventum/htdocs>
+       AllowOverride None
+       Require all granted
+
+       # Make whole eventum password protected
+#      AllowOverride None
+#      Deny from all
+#      AuthType Basic
+#      AuthUserFile /etc/webapps/eventum/users
+#      AuthGroupFile /etc/webapps/eventum/groups
+#      AuthName "Eventum"
+#      Require group eventum
+#      Satisfy any
+
+       # for SCM integration
+       <Files scm_ping.php>
+               # Set here IP of host running CVS
+               Require local
+#              Require ip xxx.xxx.xxx.xxx
+       </Files>
+
+       # rss has it's own authorization
+       <Files rss.php>
+               Require all granted
+       </Files>
+</Directory>
+
+# RPC for CLI interface
+<Directory /usr/share/eventum/htdocs/rpc>
+       # Add here clients whom you want to allow CLI access
+       Require local
+#      Require ip xxx.xxx.xxx.xxx
+</Directory>

diff --git a/eventum.spec b/eventum.spec
index 75328d3df1d964d23c2621e3f4c27e8b61a8bb0b..b56649780fbf07527f37aca97a5cb202a5f5d362 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -11,7 +11,7 @@
 
 %define                php_min_version 5.1.2
 #define                subver  RC3
-%define                rel             2
+%define                rel             3
 %include       /usr/lib/rpm/macros.php
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
@@ -41,6 +41,7 @@ Source15:     %{name}-lighttpd.conf
 Source16:      http://www.isocra.com/images/updown2.gif
 # Source16-md5:        deb6eeb2552ba757d3a949ed10c4107d
 Source17:      %{name}.tmpfiles
+Source18:      %{name}-httpd.conf
 Patch0:                %{name}-lf.patch
 Patch2:                %{name}-order.patch
 Patch3:                group-users.patch
@@ -90,6 +91,7 @@ Requires:     webserver(indexfile)
 Requires:      webserver(php) >= 4.2.0
 Suggests:      localedb
 Suggests:      php-pear-Net_LDAP2
+Conflicts:     apache-base < 2.4.0-1
 Conflicts:     logrotate < 3.8.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -522,7 +524,7 @@ install -d \
 
 touch $RPM_BUILD_ROOT%{_webappdir}/htpasswd
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
+cp -p %{SOURCE18} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
 cp -p %{SOURCE15} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
 
 install -d $RPM_BUILD_ROOT/etc/sphinx
@@ -629,10 +631,10 @@ fi
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd