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
This commit is contained in:
parent
e4a7180522
commit
4b6eecf506
@ -128,8 +128,7 @@ class openstackid (
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
$docroot_dirs = [ '/srv/openstackid', '/srv/openstackid/w',
|
$docroot_dirs = [ '/srv/openstackid' ]
|
||||||
'/srv/openstackid/w/public']
|
|
||||||
|
|
||||||
file { $docroot_dirs:
|
file { $docroot_dirs:
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
@ -211,6 +210,7 @@ class openstackid (
|
|||||||
File['/etc/openstackid/recaptcha.php'],
|
File['/etc/openstackid/recaptcha.php'],
|
||||||
File['/etc/openstackid/database.php'],
|
File['/etc/openstackid/database.php'],
|
||||||
File['/etc/openstackid/log.php'],
|
File['/etc/openstackid/log.php'],
|
||||||
|
File['/etc/openstackid/environment.php'],
|
||||||
Package[$php5_packages] ],
|
Package[$php5_packages] ],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user