From c7bdb10bbdedec29959758e39d066d3d16846e62 Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Tue, 25 Feb 2014 22:22:35 +0100
Subject: [PATCH] Openstackid deployment symlink override fix

Override existing config files with symlinks, like
bootstrap/environment.php.

Change-Id: Ibd4c81ec3b03c5c6860e5d9e0931fae7eedd8a1d
---
 modules/openstackid/files/functions | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/openstackid/files/functions b/modules/openstackid/files/functions
index 282e86f58a..6fcfaf2e51 100644
--- a/modules/openstackid/files/functions
+++ b/modules/openstackid/files/functions
@@ -47,10 +47,10 @@ function site_init() {
   chown -R $FILE_OWNER:$FILE_GROUP $target_dir
   umask 0022
   # link configuration files managed by puppet
-  ln -s /etc/openstackid/environment.php $target_dir/bootstrap/environment.php
-  ln -s /etc/openstackid/recaptcha.php $target_dir/app/config/packages/greggilbert/recaptcha/$LARAVEL_ENV/config.php
-  ln -s /etc/openstackid/database.php $target_dir/app/config/$LARAVEL_ENV/database.php
-  ln -s /etc/openstackid/log.php $target_dir/app/config/$LARAVEL_ENV/log.php
+  ln -sf /etc/openstackid/environment.php $target_dir/bootstrap/environment.php
+  ln -sf /etc/openstackid/recaptcha.php $target_dir/app/config/packages/greggilbert/recaptcha/$LARAVEL_ENV/config.php
+  ln -sf /etc/openstackid/database.php $target_dir/app/config/$LARAVEL_ENV/database.php
+  ln -sf /etc/openstackid/log.php $target_dir/app/config/$LARAVEL_ENV/log.php
   # convert app/storage into symlink and set permissions
   mv $target_dir/app/storage $SITE_ROOT/
   chmod 02770 $SITE_ROOT/storage
@@ -134,10 +134,10 @@ function site_update() {
   chown -R $FILE_OWNER:$FILE_GROUP $target_dir
   umask 0022
   # link configuration files managed by puppet
-  ln -s /etc/openstackid/environment.php $target_dir/bootstrap/environment.php
-  ln -s /etc/openstackid/recaptcha.php $target_dir/app/config/packages/greggilbert/recaptcha/$LARAVEL_ENV/config.php
-  ln -s /etc/openstackid/database.php $target_dir/app/config/$LARAVEL_ENV/database.php
-  ln -s /etc/openstackid/log.php $target_dir/app/config/$LARAVEL_ENV/log.php
+  ln -sf /etc/openstackid/environment.php $target_dir/bootstrap/environment.php
+  ln -sf /etc/openstackid/recaptcha.php $target_dir/app/config/packages/greggilbert/recaptcha/$LARAVEL_ENV/config.php
+  ln -sf /etc/openstackid/database.php $target_dir/app/config/$LARAVEL_ENV/database.php
+  ln -sf /etc/openstackid/log.php $target_dir/app/config/$LARAVEL_ENV/log.php
   # link shared app/storage directory
   rm -rf $target_dir/app/storage
   ln -s $SITE_ROOT/storage $target_dir/app