commit cd0e5f302ac524c57c242df8f86b04b7d157851f
Author: Jan Rękorajski <[email protected]>
Date: Fri May 17 11:42:27 2013 +0200
- migrated to apache 2.4
trac-httpd.conf | 45 +++++++++++++++++++++++++++++++++++++++++++++
trac.spec | 10 ++++++----
2 files changed, 51 insertions(+), 4 deletions(-)
---
diff --git a/trac.spec b/trac.spec
index 8404d6e..8368bc1 100644
--- a/trac.spec
+++ b/trac.spec
@@ -6,7 +6,7 @@ Summary(pl.UTF-8): Zintegrowane scm, wiki, system
śledzenia problemów i środo
Name: trac
# NOTE 1.x is on DEVEL branch, finish it there and then merge
Version: 0.12.5
-Release: 2
+Release: 3
License: BSD-like
Group: Applications/WWW
Source0: http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz
@@ -17,6 +17,7 @@ Source3: %{name}.ico
Source4: %{name}.ini
Source5: %{name}-enableplugin.py
Source6: %{name}-upgrade.py
+Source7: %{name}-httpd.conf
Patch0: %{name}-root2http.patch
Patch1: %{name}-defaults.patch
Patch2: inherit-global-%{name}.ini.patch
@@ -48,6 +49,7 @@ Requires: webserver(rewrite)
#Suggests: lighttpd-mod_fastcgi
#Suggests: python-textile >= 2.0
Obsoletes: trac-plugin-webadmin
+Conflicts: apache-base < 2.4.0-1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -109,7 +111,7 @@ install -d
$RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/var/lib/%{name},%{_datadi
--root=$RPM_BUILD_ROOT
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
# utility script to enable extra plugins
@@ -161,10 +163,10 @@ rm -rf $RPM_BUILD_ROOT
%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
diff --git a/trac-httpd.conf b/trac-httpd.conf
new file mode 100644
index 0000000..cff1eae
--- /dev/null
+++ b/trac-httpd.conf
@@ -0,0 +1,45 @@
+# $Id$
+Alias /trac/chrome/common /usr/share/trac/htdocs
+AliasMatch ^/trac/([^/]+)/chrome/common/js/jquery.js
/usr/share/jquery/jquery.js
+AliasMatch ^/trac/([^/]+)/chrome/common/(.*) /usr/share/trac/htdocs/$2
+# namespace for plugins
+AliasMatch ^/trac/([^/]+/)?chrome/([^/]+)/(.*) /usr/share/trac/htdocs/$2/$3
+
+<Directory "/usr/share/trac/htdocs">
+ Require all granted
+</Directory>
+
+# TracModPython
+# http://projects.edgewall.com/trac/wiki/TracModPython
+<IfModule mod_python.c>
+ <Location /trac>
+ SetHandler mod_python
+ PythonHandler trac.web.modpython_frontend
+ # For multiple projects
+ PythonOption TracEnvParentDir /var/lib/trac
+ </Location>
+ <Location ~ "^/trac/([^/]+/)?chrome/">
+ Sethandler default-handler
+ </Location>
+</IfModule>
+
+# TracCgi
+# http://projects.edgewall.com/trac/wiki/TracCgi
+<IfModule !mod_python.c>
+ ScriptAlias /trac /usr/share/trac/cgi-bin/trac.cgi
+ <Location /trac>
+ <IfModule mod_env.c>
+ SetEnv TRAC_ENV_PARENT_DIR /var/lib/trac
+ </IfModule>
+ Require all granted
+ </Location>
+</IfModule>
+
+# You need this to allow users to authenticate
+<Location ~ "^/trac/[^/]+/login">
+ AuthType Basic
+ AuthName "trac"
+ AuthUserFile /etc/webapps/trac/htpasswd
+ Require valid-user
+ Require all granted
+</Location>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/trac.git/commitdiff/cd0e5f302ac524c57c242df8f86b04b7d157851f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
