From 756f7b19447c8d1e83ddf7c3385ef2227d563426 Mon Sep 17 00:00:00 2001 From: Beth Parker Date: Tue, 2 Jul 2019 11:37:20 -0500 Subject: [PATCH] moved video lxcs onto separate image --- pillars/roles/mount/video.sls | 5 ++++- states/roles/maintain/laradev/git_branches.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pillars/roles/mount/video.sls b/pillars/roles/mount/video.sls index 62bceac..aaa8cbc 100644 --- a/pillars/roles/mount/video.sls +++ b/pillars/roles/mount/video.sls @@ -7,4 +7,7 @@ mount: user: mount ext4: /mnt/emby: - device: UUID=e1e56368-5771-4b6c-a70c-ce23dde1681c \ No newline at end of file + device: UUID=e1e56368-5771-4b6c-a70c-ce23dde1681c + ext4: + /mnt/lxc: + device: UUID=a11c4225-bf55-4888-ab15-589afde95510 diff --git a/states/roles/maintain/laradev/git_branches.sh b/states/roles/maintain/laradev/git_branches.sh index b2a86ea..f0fbb27 100644 --- a/states/roles/maintain/laradev/git_branches.sh +++ b/states/roles/maintain/laradev/git_branches.sh @@ -13,12 +13,13 @@ echo " $branch
" >> /sites/{{project}}/index.php git clone -b $branch {{repo}} "$branch" chown http:http -R "$branch" cd "$branch" - su -s /bin/bash http -c "composer install" cp .env.example .env + 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 + su -s /bin/bash http -c "composer install" php artisan key:generate php artisan migrate php artisan db:seed