From 53e315b4178d64b7a2256dc1c3e48070d5b8d19b Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 30 Dec 2024 15:12:40 +0100 Subject: [PATCH 1/4] [Vagrant] Upgrade to bookworm --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 1687351231..60117e9cf6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,7 +7,7 @@ public_folder = "/vagrant" Vagrant.configure(2) do |config| # Set server to Debian 11 / Bullseye 64bit - config.vm.box = "debian/bullseye64" + config.vm.box = "debian/bookworm64" # Disable automatic box update checking. If you disable this, then # boxes will only be checked for updates when the user runs From b5748601e343fc958edbe101254ad9043da0ae88 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 30 Dec 2024 15:29:32 +0100 Subject: [PATCH 2/4] Add php-intl --- bin/dev/vagrant_provision.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh index bf1d02f5ad..bcdb19d2bd 100755 --- a/bin/dev/vagrant_provision.sh +++ b/bin/dev/vagrant_provision.sh @@ -55,7 +55,7 @@ service apache2 restart #Install php echo ">>> Installing PHP7" -apt-get install -qq php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring php-xml imagemagick php-imagick php-zip php-gmp +apt-get install -qq php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring php-xml imagemagick php-imagick php-zip php-gmp php-intl systemctl restart apache2 echo ">>> Installing PHP8" @@ -63,7 +63,7 @@ apt-get install -qq -y lsb-release ca-certificates apt-transport-https software- echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list wget -qO - https://packages.sury.org/php/apt.gpg | sudo apt-key add - apt update -apt-get install -qq php8.0 php8.0-cli php8.0-mysql php8.0-curl php8.0-gd php8.0-mbstring php8.0-xml php8.0-imagick php8.0-zip php8.0-gmp +apt-get install -qq php8.0 php8.0-cli php8.0-mysql php8.0-curl php8.0-gd php8.0-mbstring php8.0-xml php8.0-imagick php8.0-zip php8.0-gmp php8.0-intl systemctl restart apache2 #Install mysql From 24e7bb1806ce74ff1a5c79d9282d3babbb31cfb2 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 30 Dec 2024 15:40:33 +0100 Subject: [PATCH 3/4] Improve vagrant provisioning --- bin/dev/vagrant_provision.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh index bcdb19d2bd..a402167d15 100755 --- a/bin/dev/vagrant_provision.sh +++ b/bin/dev/vagrant_provision.sh @@ -42,6 +42,18 @@ openssl genrsa -out "$SSL_DIR/xip.io.key" 4096 openssl req -new -subj "$(echo -n "$SUBJ" | tr "\n" "/")" -key "$SSL_DIR/xip.io.key" -out "$SSL_DIR/xip.io.csr" -passin pass:$PASSPHRASE openssl x509 -req -days 365 -in "$SSL_DIR/xip.io.csr" -signkey "$SSL_DIR/xip.io.key" -out "$SSL_DIR/xip.io.crt" +#Install php +echo ">>> Add PHP repository" +apt-get install -qq -y lsb-release ca-certificates apt-transport-https software-properties-common gnupg +echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list +wget -qO - https://packages.sury.org/php/apt.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg +apt update + +echo ">>> Installing PHP8" +apt-get install -qq php libapache2-mod-php php8.3-cli php8.3-mysql php8.3-curl php8.3-gd php8.3-mbstring php8.3-xml imagemagick php8.3-imagick php8.3-zip php8.3-gmp php8.3-intl + +echo ">>> Installing PHP7" +apt-get install -qq php7.4 php7.4-cli php7.4-mysql php7.4-curl php7.4-gd php7.4-mbstring php7.4-xml php7.4-imagick php7.4-zip php7.4-gmp php7.4-intl #Install apache2 echo ">>> Installing Apache2 webserver" @@ -53,19 +65,6 @@ vhost -s 192.168.56.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friend a2dissite 000-default service apache2 restart -#Install php -echo ">>> Installing PHP7" -apt-get install -qq php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring php-xml imagemagick php-imagick php-zip php-gmp php-intl -systemctl restart apache2 - -echo ">>> Installing PHP8" -apt-get install -qq -y lsb-release ca-certificates apt-transport-https software-properties-common gnupg -echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list -wget -qO - https://packages.sury.org/php/apt.gpg | sudo apt-key add - -apt update -apt-get install -qq php8.0 php8.0-cli php8.0-mysql php8.0-curl php8.0-gd php8.0-mbstring php8.0-xml php8.0-imagick php8.0-zip php8.0-gmp php8.0-intl -systemctl restart apache2 - #Install mysql echo ">>> Installing Mysql" debconf-set-selections <<< "mariadb-server mariadb-server/root_password password root" From 7a14548c0487bb7e29a8f0dd05cf935b19efab42 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 30 Dec 2024 17:44:40 +0100 Subject: [PATCH 4/4] Fixing name --- bin/dev/vagrant_provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh index a402167d15..46459fd869 100755 --- a/bin/dev/vagrant_provision.sh +++ b/bin/dev/vagrant_provision.sh @@ -46,7 +46,7 @@ openssl x509 -req -days 365 -in "$SSL_DIR/xip.io.csr" -signkey "$SSL_DIR/xip.io. echo ">>> Add PHP repository" apt-get install -qq -y lsb-release ca-certificates apt-transport-https software-properties-common gnupg echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list -wget -qO - https://packages.sury.org/php/apt.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg +wget -qO - https://packages.sury.org/php/apt.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/php.gpg apt update echo ">>> Installing PHP8"