From 041b1930c77117c7f23c07f23ea14bff77bcf49d Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 12 Oct 2011 23:38:24 +0200
Subject: rename partial correctly

---
 templates/vhosts/php_joomla/partial.erb    | 19 +++++++++++++++++++
 templates/vhosts/php_joomla/php_joomla.erb | 19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 templates/vhosts/php_joomla/partial.erb
 delete mode 100644 templates/vhosts/php_joomla/php_joomla.erb

(limited to 'templates')

diff --git a/templates/vhosts/php_joomla/partial.erb b/templates/vhosts/php_joomla/partial.erb
new file mode 100644
index 0000000..fa095ff
--- /dev/null
+++ b/templates/vhosts/php_joomla/partial.erb
@@ -0,0 +1,19 @@
+    <Directory "<%= documentroot %>/">
+<%= scope.function_template('apache/vhosts/partials/std_override_options.erb') %>
+
+<%= scope.function_template('apache/vhosts/partials/php_settings.erb') %>        
+
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
+
+        Include include.d/joomla.inc
+    </Directory>
+	
+    <Directory "<%= documentroot %>/administrator/">
+        RewriteEngine on
+
+        # Rewrite URLs to https that go for the admin area
+        RewriteCond %{REMOTE_ADDR} !^127\.[0-9]+\.[0-9]+\.[0-9]+$
+        RewriteCond %{HTTPS} !=on
+        RewriteCond %{REQUEST_URI} (.*/administrator/.*)
+        RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R]
+    </Directory>
\ No newline at end of file
diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb
deleted file mode 100644
index fa095ff..0000000
--- a/templates/vhosts/php_joomla/php_joomla.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-    <Directory "<%= documentroot %>/">
-<%= scope.function_template('apache/vhosts/partials/std_override_options.erb') %>
-
-<%= scope.function_template('apache/vhosts/partials/php_settings.erb') %>        
-
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-
-        Include include.d/joomla.inc
-    </Directory>
-	
-    <Directory "<%= documentroot %>/administrator/">
-        RewriteEngine on
-
-        # Rewrite URLs to https that go for the admin area
-        RewriteCond %{REMOTE_ADDR} !^127\.[0-9]+\.[0-9]+\.[0-9]+$
-        RewriteCond %{HTTPS} !=on
-        RewriteCond %{REQUEST_URI} (.*/administrator/.*)
-        RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R]
-    </Directory>
\ No newline at end of file
-- 
cgit v1.2.3