diff --git a/local/provision/bin/install_ohmyzsh_shell.sh b/local/provision/bin/install_ohmyzsh_shell.sh index 1c1fde8..0fc4f4e 100644 --- a/local/provision/bin/install_ohmyzsh_shell.sh +++ b/local/provision/bin/install_ohmyzsh_shell.sh @@ -7,5 +7,5 @@ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/too git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k -cp /var/www/html/docker/local/config/zsh/.zshrc ~/.zshrc -cp /var/www/html/docker/local/config/zsh/.p10k.zsh ~/.p10k.zsh +cp /var/www/html/docker/config/zsh/.zshrc ~/.zshrc +cp /var/www/html/docker/config/zsh/.p10k.zsh ~/.p10k.zsh diff --git a/local/provision/bin/sudo_web_tasks.sh b/local/provision/bin/sudo_web_tasks.sh index 9fb9044..3a11cd2 100644 --- a/local/provision/bin/sudo_web_tasks.sh +++ b/local/provision/bin/sudo_web_tasks.sh @@ -4,8 +4,8 @@ set -e apt-get update && apt-get install -y zsh nano -cp /var/www/html/docker/local/config/php/"$PHP_VERSION"/mods-available/devbox.ini /etc/php/"$PHP_VERSION"/apache2/conf.d/devbox.ini -cp /var/www/html/docker/local/config/php/"$PHP_VERSION"/mods-available/devbox.ini /etc/php/"$PHP_VERSION"/cli/conf.d/devbox.ini +cp /var/www/html/docker/config/php/"$PHP_VERSION"/mods-available/devbox.ini /etc/php/"$PHP_VERSION"/apache2/conf.d/devbox.ini +cp /var/www/html/docker/config/php/"$PHP_VERSION"/mods-available/devbox.ini /etc/php/"$PHP_VERSION"/cli/conf.d/devbox.ini # set permission to user on temp folder chown "$APACHE_USER_UID":"$APACHE_USER_GID" /var/www/html/docker/local/tmp -R diff --git a/local/provision/bin/sudo_xdebug_from_source.sh b/local/provision/bin/sudo_xdebug_from_source.sh index 1668a6c..4047d76 100644 --- a/local/provision/bin/sudo_xdebug_from_source.sh +++ b/local/provision/bin/sudo_xdebug_from_source.sh @@ -14,6 +14,6 @@ make make install # replace xdebug 3 with xdebug 2 config -cp /var/www/html/docker/local/config/php/"$PHP_VERSION"/mods-available/xdebug-custom.ini /etc/php/"$PHP_VERSION"/mods-available/xdebug-custom.ini +cp /var/www/html/docker/config/php/"$PHP_VERSION"/mods-available/xdebug-custom.ini /etc/php/"$PHP_VERSION"/mods-available/xdebug-custom.ini rm /etc/php/"$PHP_VERSION"/apache2/conf.d/90-xdebug-3.ini rm /etc/php/"$PHP_VERSION"/cli/conf.d/90-xdebug-3.ini diff --git a/local/provision/docker_provision.sh b/local/provision/docker_provision.sh index c162bab..31ce9cc 100755 --- a/local/provision/docker_provision.sh +++ b/local/provision/docker_provision.sh @@ -3,13 +3,13 @@ set -e ## FOR LAMP STACK -#docker-compose exec web bash /var/www/html/docker/local/provision/bin/sudo_web_tasks.sh -#docker-compose exec web bash /var/www/html/docker/local/provision/bin/disable_xdebug.sh -#docker-compose exec mysql bash /devbox/provision/bin/db_tasks.sh -#docker-compose exec -u $UID web bash /var/www/html/docker/local/provision/bin/web_tasks.sh -# docker-compose exec -u $UID web bash /var/www/html/docker/local/provision/bin/install_ohmyzsh_shell.sh +# docker-compose exec web bash /var/www/html/docker/provision/bin/sudo_web_tasks.sh +# docker-compose exec web bash /var/www/html/docker/provision/bin/disable_xdebug.sh +# docker-compose exec mysql bash /devbox/provision/bin/db_tasks.sh +# docker-compose exec -u $UID web bash /var/www/html/docker/provision/bin/web_tasks.sh +# docker-compose exec -u $UID web bash /var/www/html/docker/provision/bin/install_ohmyzsh_shell.sh ## FOR NODE.JS STACK -# docker-compose run nodejs bash /home/node/docker/local/provision/bin/nodejs_tasks.sh +# docker-compose run nodejs bash /home/node/docker/provision/bin/nodejs_tasks.sh docker-compose restart