From 4fa804bafe8a39135db76a7dca1917d22a60e1a4 Mon Sep 17 00:00:00 2001
From: Tim Laszlo <tim.laszlo@gmail.com>
Date: Thu, 21 Oct 2010 12:51:12 -0500
Subject: web_reports: Moved location of reports.wsgi to a more stable location

---
 misc/apache/bcfg2.conf | 4 +---
 misc/bcfg2.spec        | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'misc')

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
-- 
cgit v1.2.3-1-g7c22