More fixes to laradev

states/roles/maintain/laradev/git_branches.sh

@@ -17,8 +17,9 @@ echo " <a href='$branch/public'>$branch<br/>" >> /sites/{{project}}/index.php
     mysql -u root -e "DROP DATABASE laradev_{{project}}_$branch"
     mysql -u root -e "CREATE DATABASE laradev_{{project}}_$branch"
     mysql -u root -e "GRANT ALL ON laradev_{{project}}_$branch.* TO laradev@localhost"
-    sed -i "s/DB_DATABASE=homestead/DB_DATABASE=laradev_{{project}}_$branch/" .env
-    sed -i "s/DB_USERNAME=homestead/DB_USERNAME=laradev/" .env
+    sed -i "s/DB_DATABASE=.*/DB_DATABASE=laradev_{{project}}_$branch/" .env
+    sed -i "s/DB_USERNAME=.*/DB_USERNAME=laradev/" .env
+    sed -i "s/DB_PASSWORD=.*/DB_PASSWORD={{password}}/" .env
     su -s /bin/bash http -c "composer install"
     php artisan key:generate
     php artisan migrate

states/roles/maintain/laradev/init.sls

@@ -27,6 +27,9 @@ laradev-phpsqlite:
 laradev-phpxsl:
   pkg.installed:
     - name: php-xsl
+laradev-phpgd:
+  pkg.installed:
+    - name: php-gd
 
 database-directory:
   file.directory:
@@ -55,7 +58,7 @@ laradev-user:
   mysql_user.present:
     - name: laradev
     - host: "localhost"
-    - password: "secret"
+    - password: "{%- include 'secure/passwords/laradev_db_password.txt' -%}"
     - connection_user: root
 
 laradev-nginx-conf:
@@ -96,6 +99,7 @@ laradev-nginx-conf:
     - group: root
     - mode: 644
     - template: jinja
+      password: "{%- include 'secure/passwords/laradev_db_password.txt' -%}"
 
 "/lib/systemd/system/git_branches.service":
   file.managed: