From 01b3f417426b78390a82bebf936ca9c8b716800c Mon Sep 17 00:00:00 2001 From: flashwave Date: Sat, 4 Jun 2022 03:38:49 +0200 Subject: [PATCH] Update Vagrant setup script. --- .gitmodules | 2 +- devel/nginx/nginx.conf | 2 +- devel/setup-devbox.sh | 37 ++++++++++++++++++++++--------------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.gitmodules b/.gitmodules index b6b60d08..19f950da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lib/index"] path = lib/index - url = git@github.com:flashwave/index.git + url = https://github.com/flashwave/index.git diff --git a/devel/nginx/nginx.conf b/devel/nginx/nginx.conf index d7891df0..cddc6ff2 100644 --- a/devel/nginx/nginx.conf +++ b/devel/nginx/nginx.conf @@ -83,7 +83,7 @@ http { return 404; } - fastcgi_pass unix:/var/run/php/php7.4-fpm.sock; + fastcgi_pass unix:/var/run/php/php8.1-fpm.sock; fastcgi_index index.php; include fastcgi_params; } diff --git a/devel/setup-devbox.sh b/devel/setup-devbox.sh index 3c3b4435..a5edb2fd 100644 --- a/devel/setup-devbox.sh +++ b/devel/setup-devbox.sh @@ -23,11 +23,11 @@ apt-get update apt-get full-upgrade -y echo -e "=> Installing required packages" -apt-get install -y nginx-full mariadb-server-10.6 openssl \ - php7.4 php7.4-bcmath php7.4-cli php7.4-common php7.4-curl php7.4-dev \ - php7.4-fpm php7.4-gd php7.4-igbinary php7.4-imagick php7.4-intl \ - php7.4-ldap php7.4-mbstring php7.4-mysql php7.4-opcache php7.4-readline \ - php7.4-redis php7.4-sqlite3 php7.4-xml php7.4-zip +apt-get install -y nginx-full mariadb-server-10.6 openssl git \ + php8.1 php8.1-bcmath php8.1-cli php8.1-common php8.1-curl php8.1-dev \ + php8.1-fpm php8.1-gd php8.1-igbinary php8.1-imagick php8.1-intl \ + php8.1-ldap php8.1-mbstring php8.1-mysql php8.1-opcache php8.1-readline \ + php8.1-redis php8.1-sqlite3 php8.1-xml php8.1-zip SSL_DHPARAM=/vagrant/devel/nginx/dhparam.pem SSL_CRT=/vagrant/devel/nginx/misuzu.crt @@ -53,27 +53,31 @@ service nginx restart echo -e "=> Adjusting PHP configuration" echo -e "==> Set display_startup_errors to On" -sed -i 's/display_startup_errors = Off/display_startup_errors = On/g' /etc/php/7.4/fpm/php.ini +sed -i 's/display_startup_errors = Off/display_startup_errors = On/g' /etc/php/8.1/fpm/php.ini echo -e "==> Increase max upload size to 150M" -sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 150M/g' /etc/php/7.4/fpm/php.ini +sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 150M/g' /etc/php/8.1/fpm/php.ini echo -e "==> Increase max body size to 150M" -sed -i 's/post_max_size = 8M/post_max_size = 150M/g' /etc/php/7.4/fpm/php.ini +sed -i 's/post_max_size = 8M/post_max_size = 150M/g' /etc/php/8.1/fpm/php.ini echo -e "==> Change FPM user to vagrant" -sed -i 's/user = www-data/user = vagrant/g' /etc/php/7.4/fpm/pool.d/www.conf -sed -i 's/listen.owner = www-data/listen.owner = vagrant/g' /etc/php/7.4/fpm/pool.d/www.conf +sed -i 's/user = www-data/user = vagrant/g' /etc/php/8.1/fpm/pool.d/www.conf +sed -i 's/listen.owner = www-data/listen.owner = vagrant/g' /etc/php/8.1/fpm/pool.d/www.conf echo -e "==> Change FPM group to vagrant" -sed -i 's/group = www-data/group = vagrant/g' /etc/php/7.4/fpm/pool.d/www.conf -sed -i 's/listen.group = www-data/listen.group = vagrant/g' /etc/php/7.4/fpm/pool.d/www.conf +sed -i 's/group = www-data/group = vagrant/g' /etc/php/8.1/fpm/pool.d/www.conf +sed -i 's/listen.group = www-data/listen.group = vagrant/g' /etc/php/8.1/fpm/pool.d/www.conf echo -e "==> Restarting PHP-FPM" -service php7.4-fpm restart +service php8.1-fpm restart echo -e "=> Adjusting MariaDB configuration" +echo -e "==> Bind to all addresses" +sed -i 's/= 127.0.0.1/= 0.0.0.0/g' /etc/mysql/mariadb.conf.d/50-server.cnf +service mysql restart + echo -e "==> Creating MariaDB database" mysql -vv -e "CREATE DATABASE misuzu COLLATE 'utf8mb4_bin'" @@ -125,6 +129,9 @@ echo -e "==> Replacing Misuzu config.ini" rm $MSZ_CONFIG cp /vagrant/devel/misuzu/config.ini $MSZ_CONFIG +echo -e "==> Updating Git submodules" +sudo -u vagrant git -C /vagrant submodule update --init + # ENTER: JANK echo -e "==> Enable Misuzu debug mode" sudo -u vagrant touch /vagrant/.debug @@ -133,10 +140,10 @@ echo -e "==> Running composer install as vagrant" sudo -u vagrant composer install -d /vagrant echo -e "==> Adding frequent cron jobs as vagrant" -(sudo -u vagrant crontab -l 2>/dev/null; echo "0,10,20,30,40 * * * * php7.4 /www/misuzu/msz cron") | sudo -u vagrant crontab - +(sudo -u vagrant crontab -l 2>/dev/null; echo "0,10,20,30,40 * * * * php8.1 /www/misuzu/msz cron") | sudo -u vagrant crontab - echo -e "==> Adding infrequent cron jobs as vagrant" -(sudo -u vagrant crontab -l 2>/dev/null; echo "50 * * * * php7.4 /www/misuzu/msz cron low") | sudo -u vagrant crontab - +(sudo -u vagrant crontab -l 2>/dev/null; echo "50 * * * * php8.1 /www/misuzu/msz cron low") | sudo -u vagrant crontab - echo -e "==> Nuking /www" rm -rf /www