diff --git a/.local/bin/vlw_install_programs b/.local/bin/vlw_install_programs index 6512392..71d70f9 100755 --- a/.local/bin/vlw_install_programs +++ b/.local/bin/vlw_install_programs @@ -6,7 +6,7 @@ install_packages() { "git" "curl" ) - + # Create a string with the package names separated by spaces local package_list="${PACKAGES[*]}" @@ -24,6 +24,7 @@ install_mariadb() { # Create a database user for the webserver sudo mysql -u root -e "CREATE USER 'www-data'@'localhost' IDENTIFIED WITH unix_socket; GRANT ALL PRIVILEGES ON *.* TO 'www-data'@'localhost' WITH GRANT OPTION; FLUSH PRIVILEGES;" + sudo mysql -u root -e "CREATE USER '$(whoami)'@'localhost' IDENTIFIED WITH unix_socket; GRANT ALL PRIVILEGES ON *.* TO '$(whoami)'@'localhost' WITH GRANT OPTION; FLUSH PRIVILEGES;" } install_vegvisir() { @@ -48,7 +49,7 @@ install_vegvisir() { install_reflect() { local PATH_TMP="/tmp/tmp-reflect" - # Create a git directory where we will install Vegvisir temporarily + # Create a git directory where we will install Reflect temporarily sudo rm -rf $PATH_TMP mkdir $PATH_TMP cd $PATH_TMP @@ -87,7 +88,7 @@ install_webserver() { sudo rm $PATH_NGINX/sites-enabled/default # Download default configs - sudo curl -o $PATH_NGINX/snippets/ssl.conf https://git.vlw.se/config/nginx-dev/raw/branch/master/snippets/ssl.conf + sudo curl -o $PATH_NGINX/snippets/vlw.se-ssl.conf https://git.vlw.se/config/nginx-dev/raw/branch/master/snippets/vlw.se-ssl.conf sudo curl -o $PATH_NGINX/sites-available/44300.conf https://git.vlw.se/config/nginx-dev/raw/branch/master/sites-available/44300.conf sudo curl -o $PATH_NGINX/sites-available/44301.conf https://git.vlw.se/config/nginx-dev/raw/branch/master/sites-available/44301.conf sudo curl -o $PATH_NGINX/sites-available/44302.conf https://git.vlw.se/config/nginx-dev/raw/branch/master/sites-available/44302.conf @@ -98,16 +99,17 @@ install_webserver() { sudo ln -s /etc/nginx/sites-available/44300.conf /etc/nginx/sites-enabled sudo ln -s /etc/nginx/sites-available/44301.conf /etc/nginx/sites-enabled sudo ln -s /etc/nginx/sites-available/44302.conf /etc/nginx/sites-enabled - - sudo chown :www-data -R $WWW_PATH + + sudo chown $(whoami):www-data -R $WWW_PATH } install_pma() { local VERSION="5.2.3" local PATH_TOOLS="/var/www/tools" - + curl -L https://files.phpmyadmin.net/phpMyAdmin/$VERSION/phpMyAdmin-$VERSION-english.tar.gz | tar -xz -C /tmp - mv /tmp/phpMyAdmin-$VERSION-english $PATH_TOOLS/pma + sudo mv /tmp/phpMyAdmin-$VERSION-english $PATH_TOOLS/pma + sudo chown :www-data -R $PATH_TOOLS/pma } install_php_fpm() { @@ -154,8 +156,9 @@ install_code_server() { #install_packages #install_php_fpm -install_webserver +#install_webserver #install_vegvisir #install_reflect #install_pma -#install_code_server \ No newline at end of file +#install_mariadb +#install_code_server