From a659e2846b82e9a96aa65cd64f0e40fe2292bbf2 Mon Sep 17 00:00:00 2001 From: Beth Parker Date: Wed, 29 Jul 2020 21:56:57 -0500 Subject: [PATCH] More fixes to laradev --- states/roles/maintain/laradev/git_branches.sh | 5 +++-- states/roles/maintain/laradev/init.sls | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/states/roles/maintain/laradev/git_branches.sh b/states/roles/maintain/laradev/git_branches.sh index f0fbb27..1405c0d 100644 --- a/states/roles/maintain/laradev/git_branches.sh +++ b/states/roles/maintain/laradev/git_branches.sh @@ -17,8 +17,9 @@ echo " $branch
" >> /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 diff --git a/states/roles/maintain/laradev/init.sls b/states/roles/maintain/laradev/init.sls index b67975c..ebeecce 100644 --- a/states/roles/maintain/laradev/init.sls +++ b/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: