bootstrap.sh: fix permission handling of sites/default/settings.php

drush site-install can change the permissions in sites/default so use
a more robust scheme to set them when needed.

diff --git a/libexec/bootstrap.sh b/libexec/bootstrap.sh
index d2ebda7..279833a 100755 (executable)
--- a/libexec/bootstrap.sh
+++ b/libexec/bootstrap.sh
@@ -102,13 +102,14 @@ fi
 
 pushd "$SITE_LOCAL_PATH"
 
 
 pushd "$SITE_LOCAL_PATH"
 

-chmod 755 sites/default
-chmod 644 sites/default/settings.php
-

 # Update the install_profile if it's already there
 if grep -q "^\\\$settings\['install_profile'\] =" sites/default/settings.php;
 then
 # Update the install_profile if it's already there
 if grep -q "^\\\$settings\['install_profile'\] =" sites/default/settings.php;
 then

+  chmod 755 sites/default
+  chmod 644 sites/default/settings.php

   sed -i -e "s/^\(\$settings\['install_profile'\]\) = '[^']*';/\1 = '$INSTALLATION_PROFILE';/g" sites/default/settings.php
   sed -i -e "s/^\(\$settings\['install_profile'\]\) = '[^']*';/\1 = '$INSTALLATION_PROFILE';/g" sites/default/settings.php

+  chmod 444 sites/default/settings.php
+  chmod 555 sites/default

 fi
 
 $DRUSH --verbose --yes \
 fi
 
 $DRUSH --verbose --yes \


@@ -142,6 +143,9 @@ sudo chgrp -R "$WEB_SERVER_GROUP" sites/default/files
 # Enables clean URLs
 sed -i "s@# RewriteBase /drupal\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
 
 # Enables clean URLs
 sed -i "s@# RewriteBase /drupal\$@RewriteBase ${SITE_BASE_PATH}@" .htaccess
 

+chmod 755 sites/default
+chmod 644 sites/default/settings.php
+

 # Add some basic settings to settings.php
 if ! grep -q "^\\\$settings\['trusted_host_patterns'\] =" sites/default/settings.php;
 then
 # Add some basic settings to settings.php
 if ! grep -q "^\\\$settings\['trusted_host_patterns'\] =" sites/default/settings.php;
 then