commit 79b64099aa9c6d1200ad9f1a83a74da41de4c16a
Author: Jan Rękorajski <[email protected]>
Date: Wed May 15 22:50:19 2013 +0200
- migrated to apache 2.4
mercurial-hgweb-apache.config | 22 ++++++++++++++++++++++
mercurial-hgweb-httpd.config | 36 ++++++++++++++++--------------------
mercurial.spec | 14 ++++++++------
3 files changed, 46 insertions(+), 26 deletions(-)
---
diff --git a/mercurial.spec b/mercurial.spec
index aa4c1b0..6c81aea 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -16,7 +16,7 @@ Summary: Mercurial Distributed SCM
Summary(pl.UTF-8): Mercurial - rozproszony SCM
Name: mercurial
Version: 2.6
-Release: 1
+Release: 2
License: GPL v2
Group: Development/Version Control
Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
@@ -24,7 +24,8 @@ Source0:
http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
Source1: gtools.py
Source2: %{name}-%{webapp}.config
# TODO: provide default config
-Source3: %{name}-%{webapp}-httpd.config
+Source3: %{name}-%{webapp}-apache.config
+Source4: %{name}-%{webapp}-httpd.config
Patch0: %{name}-doc.patch
URL: http://mercurial.selenic.com/
BuildRequires: gettext-devel
@@ -36,6 +37,7 @@ BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
%{?with_tests:BuildRequires: unzip}
%pyrequires_eq python-modules
+Conflicts: apache-base < 2.4.0-1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -131,8 +133,8 @@ install *.cgi $RPM_BUILD_ROOT%{cgibindir}/
install -d $RPM_BUILD_ROOT%{webappdir}
install %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/%{webapp}.config
-> $RPM_BUILD_ROOT%{webappdir}/httpd.conf
-> $RPM_BUILD_ROOT%{webappdir}/apache.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/apache.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
install contrib/hgk $RPM_BUILD_ROOT%{_bindir}
@@ -153,10 +155,10 @@ rm -rf $RPM_BUILD_ROOT
%triggerun hgweb -- apache1 < 1.3.37-3, apache1-base
%webapp_unregister apache %{webapp}
-%triggerin hgweb -- apache < 2.2.0, apache-base
+%triggerin hgweb -- apache-base
%webapp_register httpd %{webapp}
-%triggerun hgweb -- apache < 2.2.0, apache-base
+%triggerun hgweb -- apache-base
%webapp_unregister httpd %{webapp}
%files
diff --git a/mercurial-hgweb-apache.config b/mercurial-hgweb-apache.config
new file mode 100644
index 0000000..4eb2e8a
--- /dev/null
+++ b/mercurial-hgweb-apache.config
@@ -0,0 +1,22 @@
+WSGIScriptAlias / /usr/lib64/mercurial/hgwebdir.cgi
+
+<Directory /usr/lib64/mercurial>
+ AllowOverride All
+ Options ExecCGI
+ Order Deny,Allow
+ SetHandler cgi-script
+# Deny from All
+ Allow from 192.168.*
+ Allow from All
+</Directory>
+
+DocumentRoot /home/services/hg
+
+<Directory /home/services/hg>
+ Options FollowSymlinks Indexes
+ DirectoryIndex index.html
+
+ AllowOverride All
+ Order deny,allow
+ Allow from all
+</Directory>
diff --git a/mercurial-hgweb-httpd.config b/mercurial-hgweb-httpd.config
index d20c859..f066acb 100644
--- a/mercurial-hgweb-httpd.config
+++ b/mercurial-hgweb-httpd.config
@@ -1,24 +1,20 @@
+WSGIScriptAlias / /usr/lib64/mercurial/hgwebdir.cgi
- WSGIScriptAlias / /usr/lib64/mercurial/hgwebdir.cgi
+<Directory /usr/lib64/mercurial>
+ AllowOverride All
+ Options ExecCGI
+ SetHandler cgi-script
+# Require all denied
+# Require ip 192.168.0.0/16
+ Require all granted
+</Directory>
- <Directory /usr/lib64/mercurial>
- AllowOverride All
- Options ExecCGI
- Order Deny,Allow
- SetHandler cgi-script
-# Deny from All
- Allow from 192.168.*
- Allow from All
- </Directory>
+DocumentRoot /home/services/hg
- DocumentRoot /home/services/hg
-
- <Directory /home/services/hg>
- Options FollowSymlinks Indexes
- DirectoryIndex index.html
-
- AllowOverride All
- Order deny,allow
- Allow from all
- </Directory>
+<Directory /home/services/hg>
+ Options FollowSymlinks Indexes
+ DirectoryIndex index.html
+ AllowOverride All
+ Require all granted
+</Directory>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mercurial.git/commitdiff/79b64099aa9c6d1200ad9f1a83a74da41de4c16a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
