diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-03-21 09:40:14 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-03-21 09:40:14 -0500 |
| commit | f36c89f5e78a3a2fcd9ad4b38b8670895883bd38 (patch) | |
| tree | 2f7bd62dfd462231f8d9253cbc84b6f76011b30a | |
| parent | 7d22e7fe4bff3c229ed0cb8d3a792e508ba13cce (diff) | |
| parent | 3126fa49d61708abf339231a956f30bb24b6018c (diff) | |
| download | bcfg2-f36c89f5e78a3a2fcd9ad4b38b8670895883bd38.tar.gz bcfg2-f36c89f5e78a3a2fcd9ad4b38b8670895883bd38.tar.bz2 bcfg2-f36c89f5e78a3a2fcd9ad4b38b8670895883bd38.zip | |
Merge branch 'maint'
| -rw-r--r-- | misc/apache/bcfg2.conf | 2 | ||||
| -rw-r--r-- | misc/bcfg2.spec | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/misc/apache/bcfg2.conf b/misc/apache/bcfg2.conf index 6cd5addf5..b8409a513 100644 --- a/misc/apache/bcfg2.conf +++ b/misc/apache/bcfg2.conf @@ -4,7 +4,7 @@ # WSGIScriptAlias /bcfg2 "/usr/share/bcfg2/reports.wsgi" - WSGISocketPrefix /var/run/httpd/wsgi + WSGISocketPrefix /var/run/apache2/wsgi WSGIDaemonProcess Bcfg2.Server.Reports processes=1 threads=10 WSGIProcessGroup Bcfg2.Server.Reports diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index ece69eda5..e6b21d76c 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -311,6 +311,7 @@ cp -r tools/* %{buildroot}%{_defaultdocdir}/bcfg2-server-%{version} cp -r build/sphinx/html/* %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version} %{__install} -d %{buildroot}%{apache_conf}/conf.d +sed -i "s/apache2/httpd/g" misc/apache/bcfg2.conf %{__install} -m 644 misc/apache/bcfg2.conf %{buildroot}%{apache_conf}/conf.d/wsgi_bcfg2.conf %{__mkdir_p} %{buildroot}%{_localstatedir}/cache/%{name} |