From f6c93e0bda5c042d0ee3d25348df04d069997fb3 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 2 Apr 2012 11:05:35 +0000
Subject: move the others files in subdirectory

---
 modules/apache/manifests/mod/php.pp    |  2 +-
 modules/apache/manifests/mod/wsgi.pp   |  2 +-
 modules/apache/templates/mod/php.conf  |  5 +++++
 modules/apache/templates/mod/wsgi.conf | 12 ++++++++++++
 modules/apache/templates/mod_php.conf  |  5 -----
 modules/apache/templates/mod_wsgi.conf | 12 ------------
 6 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 modules/apache/templates/mod/php.conf
 create mode 100644 modules/apache/templates/mod/wsgi.conf
 delete mode 100644 modules/apache/templates/mod_php.conf
 delete mode 100644 modules/apache/templates/mod_wsgi.conf

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/mod/php.pp b/modules/apache/manifests/mod/php.pp
index 28ac6e31..c5de893e 100644
--- a/modules/apache/manifests/mod/php.pp
+++ b/modules/apache/manifests/mod/php.pp
@@ -5,6 +5,6 @@ class apache::mod::php {
     package { 'apache-mod_php': }
 
     apache::config { '/etc/httpd/conf.d/mod_php.conf':
-        content => template('apache/mod_php.conf'),
+        content => template('apache/mod/php.conf'),
     }
 }
diff --git a/modules/apache/manifests/mod/wsgi.pp b/modules/apache/manifests/mod/wsgi.pp
index 416adb34..d2ab72d2 100644
--- a/modules/apache/manifests/mod/wsgi.pp
+++ b/modules/apache/manifests/mod/wsgi.pp
@@ -7,6 +7,6 @@ class apache::mod::wsgi {
     }
 
     apache::config { '/etc/httpd/conf.d/mod_wsgi.conf':
-        content => template('apache/mod_wsgi.conf'),
+        content => template('apache/mod/wsgi.conf'),
     }
 }
diff --git a/modules/apache/templates/mod/php.conf b/modules/apache/templates/mod/php.conf
new file mode 100644
index 00000000..6d64ffb8
--- /dev/null
+++ b/modules/apache/templates/mod/php.conf
@@ -0,0 +1,5 @@
+# as php insist to have this value set, let's
+# look on the system for him
+php_value date.timezone "<%= php_date_timezone %>"
+php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f root@<%= domain %>"
+
diff --git a/modules/apache/templates/mod/wsgi.conf b/modules/apache/templates/mod/wsgi.conf
new file mode 100644
index 00000000..0ecba31a
--- /dev/null
+++ b/modules/apache/templates/mod/wsgi.conf
@@ -0,0 +1,12 @@
+# http://code.google.com/p/modwsgi/wiki/ApplicationIssues
+# mainly for viewvc at the moment , when doing a diff
+WSGIRestrictStdout Off
+# again viewvc :
+# mod_wsgi (pid=20083): Callback registration for signal 15 ignored.
+# no bug reported upstream yet :/
+# WSGIRestrictSignal Off 
+# reenabled, as this prevent apache from restarting properly
+
+# make sure transifex client work fine, as we need wsgi to pass autorisation
+# header to django ( otherwise, this just show error 401 )
+WSGIPassAuthorization On
diff --git a/modules/apache/templates/mod_php.conf b/modules/apache/templates/mod_php.conf
deleted file mode 100644
index 6d64ffb8..00000000
--- a/modules/apache/templates/mod_php.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# as php insist to have this value set, let's
-# look on the system for him
-php_value date.timezone "<%= php_date_timezone %>"
-php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f root@<%= domain %>"
-
diff --git a/modules/apache/templates/mod_wsgi.conf b/modules/apache/templates/mod_wsgi.conf
deleted file mode 100644
index 0ecba31a..00000000
--- a/modules/apache/templates/mod_wsgi.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# http://code.google.com/p/modwsgi/wiki/ApplicationIssues
-# mainly for viewvc at the moment , when doing a diff
-WSGIRestrictStdout Off
-# again viewvc :
-# mod_wsgi (pid=20083): Callback registration for signal 15 ignored.
-# no bug reported upstream yet :/
-# WSGIRestrictSignal Off 
-# reenabled, as this prevent apache from restarting properly
-
-# make sure transifex client work fine, as we need wsgi to pass autorisation
-# header to django ( otherwise, this just show error 401 )
-WSGIPassAuthorization On
-- 
cgit v1.2.1