From 4b6eecf50647ee2210aac1273c441b21c41c34d6 Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Wed, 26 Feb 2014 01:20:55 +0100
Subject: [PATCH] Fix openstackid vhost override
Remove /srv/openstackid/w symlink file override by puppet, and
add deploy dependency on /etc/openstackid/environment.php.
Change-Id: Ib3874f48cad720d667861d90f76c515e014002c2
---
modules/openstackid/manifests/init.pp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/openstackid/manifests/init.pp b/modules/openstackid/manifests/init.pp
index edd90f6e4f..bc623dd03d 100644
--- a/modules/openstackid/manifests/init.pp
+++ b/modules/openstackid/manifests/init.pp
@@ -128,8 +128,7 @@ class openstackid (
]
}
- $docroot_dirs = [ '/srv/openstackid', '/srv/openstackid/w',
- '/srv/openstackid/w/public']
+ $docroot_dirs = [ '/srv/openstackid' ]
file { $docroot_dirs:
ensure => directory,
@@ -211,6 +210,7 @@ class openstackid (
File['/etc/openstackid/recaptcha.php'],
File['/etc/openstackid/database.php'],
File['/etc/openstackid/log.php'],
+ File['/etc/openstackid/environment.php'],
Package[$php5_packages] ],
}