X-Git-Url: https://git.ao2.it/drupal-init-tools.git/blobdiff_plain/9359efb8c4f5176d4a9f0a91a7461ae208c82efd..753d330f19438d3d675421e1ffb292cfbaa5dc52:/libexec/new.sh

diff --git a/libexec/new.sh b/libexec/new.sh
index 385c141..890b1d0 100755
--- a/libexec/new.sh
+++ b/libexec/new.sh
@@ -20,7 +20,7 @@ set -e
 
 usage() {
   cat <<EOF
-usage: drin $(basename $0 .sh) [-h|--help] <destdir>
+usage: drin $(basename "$0" .sh) [-h|--help] <destdir>
 
 Create a new Drupal project in the 'destdir' directory.
 
@@ -64,14 +64,9 @@ pushd "$DESTDIR"
 
 git remote rename origin upstream
 git checkout -b master
-echo >> .gitignore
-echo "# Ignore the configuration for the bootstrap script" >> .gitignore
-echo "bootstrap.conf" >> .gitignore
 
-# Add some patches, use sed until composer can do that from the command line
-# (e.g. composer config ...)
-sed -i -e 's@"extra": {@"extra": {\
-        "patches-file": "composer.patches.json",@' composer.json
+# Add some patches
+composer config extra.patches-file "composer.patches.json"
 
 cat > composer.patches.json <<EOF
 {
@@ -111,7 +106,23 @@ cat > bootstrap.conf <<EOF
 #  "ip6-localhost"
 #  )
 
-#MYSQL_ROOT_PASSWORD="password"
+# See the 'drin' man page for details about database access.
+
+# Set MYSQL_PASSWORDLESS_ACCESS to 'true' if the database is configured to
+# allow administrative password-less access to the user who will execute the
+# 'drin boostrap' command.
+#MYSQL_PASSWORDLESS_ACCESS=true
+
+# If, instead,  administrative access requires a password, uncomment and
+# change the values of the following variables.
+#MYSQL_SU_USER='root'
+#MYSQL_SU_PASSWORD='password'
+EOF
+
+cat >> .gitignore <<EOF
+
+# Ignore the configuration for the bootstrap script
+bootstrap.conf
 EOF
 
 echo
@@ -120,7 +131,7 @@ echo "Uncomment and customize the values in the bootstrap.conf file."
 # Add some basic access control to protect sensitive files like bootstrap.conf
 cat > .htaccess <<EOF
 Options -Indexes
-SetEnvIf Request_URI "/web/.*" access_granted
+SetEnvIf Request_URI "/web(/.*)?$" access_granted
 Order allow,deny
 Allow from env=access_granted
 EOF