Fixed too long password for mysql. Fixed no enable-drupal target. Fixed no email...

diff --git a/prj-site b/prj-site
index 8cb13db093d39ee72e77116a4f94db7a03cfe9d0..abeae6944706fd57ccd256954ada5d46bb54faa9 100755 (executable)
--- a/prj-site
+++ b/prj-site
@@ -3,6 +3,8 @@
 op="$1"
 name="$2"
 type="$3"
+sql_user=`expr substr rdlugoleck_$name 1 16`
+sql_password=`pwgen -1 -s 50`
 
-make name=$name type=$type -s -f ~/prj/prj-utils/prj-site-make $op
+make name=$name type=$type sql_user=$sql_user sql_password=$sql_password -s -f ~/prj/prj-utils/prj-site-make $op
 

diff --git a/prj-site-make b/prj-site-make
index d346be7b3291fc27c104ea528b3c86b7fa67cd64..f1009016ebb338abfd9e32a188f0400b8978bd82 100755 (executable)
--- a/prj-site-make
+++ b/prj-site-make
@@ -1,7 +1,4 @@
-#email="dlugolecki.rafal@gmail.com"
-sql_user = rdlugoleck_${name}
-# this allows me to evaluate pwgen result to value
-$(eval sql_password := $(shell pwgen -1 -s 50))
+email="example@example.com"
 apache_sites = '/etc/apache2/sites-available'
 project_dir = `pwd`/${name}
 host = ${name}
@@ -128,6 +125,8 @@ create-drupal: create-directories
        cd ${project_dir}/www && drush en seven toolbar shortcut -y
        cd ${project_dir}/www && drush vset admin_theme seven
 
+enable-drupal:
+
 purge-drupal:
        echo "> Removing SQL user"
        sudo mysql --defaults-file=/etc/mysql/debian.cnf -e "DROP USER '${sql_user}'@'localhost';"