summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2010-10-21 12:51:12 -0500
committerSol Jerome <sol.jerome@gmail.com>2010-11-02 20:35:19 -0500
commitbccfe3f9f173f3fa5fb86914778e48d9923bc2ae (patch)
tree934c3e2d52cc9c5d1b458db9d0ded9660c080dba /misc
parent31688574736713d0f9bf33ed0c3a9ae8e5b0c718 (diff)
downloadbcfg2-bccfe3f9f173f3fa5fb86914778e48d9923bc2ae.tar.gz
bcfg2-bccfe3f9f173f3fa5fb86914778e48d9923bc2ae.tar.bz2
bcfg2-bccfe3f9f173f3fa5fb86914778e48d9923bc2ae.zip
web_reports: Moved location of reports.wsgi to a more stable location
Diffstat (limited to 'misc')
-rw-r--r--misc/apache/bcfg2.conf4
-rw-r--r--misc/bcfg2.spec5
2 files changed, 4 insertions, 5 deletions
diff --git a/misc/apache/bcfg2.conf b/misc/apache/bcfg2.conf
index 2963091ec..b9b4b0452 100644
--- a/misc/apache/bcfg2.conf
+++ b/misc/apache/bcfg2.conf
@@ -1,10 +1,8 @@
-LoadModule wsgi_module modules/mod_wsgi.so
-
<IfModule mod_wsgi.c>
#
# If the root is changed update the static content alias as well
#
- WSGIScriptAlias /bcfg2 "/usr/lib/python2.4/site-packages/Bcfg2/Server/Reports/reports.wsgi"
+ WSGIScriptAlias /bcfg2 "/usr/share/bcfg2/reports.wsgi"
WSGISocketPrefix run
WSGIDaemonProcess Bcfg2.Server.Reports processes=1 threads=10
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index e9798c39f..8e77ad908 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -158,7 +158,7 @@ deployment strategies.
%{__install} -m 755 tools/bcfg2-cron %{buildroot}%{_prefix}/lib/bcfg2/bcfg2-cron
%{__install} -d %{buildroot}%{apache_conf}/conf.d
-%{__install} -m 644 misc/apache/bcfg2.conf %{buildroot}%{apache_conf}/conf.d/bcfg2.conf
+%{__install} -m 644 misc/apache/bcfg2.conf %{buildroot}%{apache_conf}/conf.d/wsgi_bcfg2.conf
%clean
[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} || exit 2
@@ -209,9 +209,10 @@ deployment strategies.
%files -n bcfg2-web
%defattr(-,root,root,-)
+%{_datadir}/bcfg2/reports.wsgi
%{_datadir}/bcfg2/site_media
-%config(noreplace) %{apache_conf}/conf.d/bcfg2.conf
+%config(noreplace) %{apache_conf}/conf.d/wsgi_bcfg2.conf
%changelog
* Mon Jun 21 2010 Fabian Affolter <fabian@bernewireless.net> - 1.1.0rc3-0.1