refactor: update vagrant configuration (#5124)

This commit is contained in:
Alexis Saettler
2021-04-29 22:02:23 +02:00
committed by GitHub
parent a478fd8f43
commit 75cc20e19a
7 changed files with 16 additions and 21 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ APP_DEBUG=false
# The encryption key. This is the most important part of the application. Keep
# this secure otherwise, everyone will be able to access your application.
# Must be 32 characters long exactly.
# Use `php artisan key:generate` or `pwgen -s 32 1` to generate a random key.
# Use `php artisan key:generate` or `echo -n 'base64:'; openssl rand -base64 32` to generate a random key.
APP_KEY=ChangeMeBy32KeyLengthOrGenerated
# Prevent information leakage by referring to IDs with hashIds instead of
+1 -1
View File
@@ -44,7 +44,7 @@ Install PHP 7.4 with these extensions:
```sh
sudo apt install -y php php-bcmath php-curl php-gd php-gmp php-imagick \
php-intl php-mbstring php-mysql php-xml php-zip
php-intl php-mbstring php-mysql php-redis php-xml php-zip
```
**Composer:** After you're done installing PHP, you'll need the Composer dependency manager.
+1 -1
View File
@@ -14,7 +14,7 @@ Monica can be deployed on Heroku using the button below:
## Installation
Before deployment, Heroku will ask you to define a few variables.
- Please ensure to enter a custom `APP_KEY` when asked (if, for example, you have the `pwgen` utility installed, you could copy and paste the output of `pwgen -s 32 1`).
- Please ensure to enter a custom `APP_KEY` when asked (you can for instance copy and paste the output of `echo -n 'base64:'; openssl rand -base64 32`).
- In addition, you can edit the email address Monica will send emails to (`MAIL_FROM_ADDRESS`), the name of the sender (`MAIL_FROM_NAME`), where emails should link to (`APP_URL`) and some other important variables on that screen.
After deployment, click on ![Manage App](../../images/heroku_manage_app.png) to open the dashboard of your new application:
+3 -3
View File
@@ -53,9 +53,9 @@ Then install php 7.4 with these extensions:
```sh
sudo apt update
sudo apt install -y php7.4 php7.4-cli php7.4-common php7.4-fpm \
php7.4-json php7.4-opcache php7.4-mysql php7.4-mbstring php7.4-zip \
php7.4-bcmath php7.4-intl php7.4-xml php7.4-curl php7.4-gd php7.4-gmp php7.4-imagick
sudo apt install -y php7.4 php7.4-bcmath php7.4-cli php7.4-curl php7.4-common php7.4-fpm \
php7.4-gd php7.4-gmp php7.4-imagick php7.4-intl php7.4-json php7.4-mbstring \
php7.4-mysql php7.4-opcache php7.4-redis php7.4-xml php7.4-zip
```
**Composer:** After you're done installing PHP, you'll need the [Composer](https://getcomposer.org/download/) dependency manager.
+2 -6
View File
@@ -6,16 +6,12 @@ VAGRANTFILE_API_VERSION ||= "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.synced_folder ".", "/vagrant"
config.vm.provider "virtualbox" do |vb|
vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ]
end
# Create a box with the latest version available
config.vm.define "monicahq-latest", primary: true do |monicahq|
monicahq.vm.box = "ubuntu/bionic64"
monicahq.vm.hostname = "monica"
monicahq.vm.boot_timeout = 180
monicahq.vm.provision "shell", path: "install-monica.sh", keep_color: true
end
@@ -23,7 +19,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.define "monicahq-stable" do |monicahq|
monicahq.vm.box = "ubuntu/bionic64"
monicahq.vm.hostname = "monica"
monicahq.vm.boot_timeout = 180
monicahq.vm.provision "shell", path: "install-monica.sh", keep_color: true, env: {"GIT_TAG" => "#{ENV['GIT_TAG']}"}
end
+6 -7
View File
@@ -38,9 +38,8 @@ debconf-set-selections <<< "mysql-server mysql-server/root_password_again passwo
apt-get install -y mysql-server mysql-client >/dev/null
echo -e "\n\033[4;32mInstalling PHP 7.4\033[0;40m"
apt install -y curl gnupg2 apt-transport-https apt-transport-https lsb-release ca-certificates
curl -s https://packages.sury.org/php/apt.gpg -o /etc/apt/trusted.gpg.d/php.gpg
echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/php.list
apt-get install -y curl gnupg2 apt-transport-https apt-transport-https lsb-release ca-certificates >/dev/null
add-apt-repository -y ppa:ondrej/php >/dev/null
apt-get update >/dev/null
apt-get install -y php7.4 >/dev/null
@@ -49,12 +48,12 @@ apt-get install -y git >/dev/null
echo -e "\n\033[4;32mInstalling composer\033[0;40m"
apt-get install -y curl php7.4-cli >/dev/null
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer >/dev/null
echo -e "\n\033[4;32mInstalling packages for Monica\033[0;40m"
apt-get install -y php7.4-common php7.4-fpm \
php7.4-json php7.4-opcache php7.4-mysql php7.4-mbstring php7.4-zip \
php7.4-bcmath php7.4-intl php7.4-xml php7.4-curl php7.4-gd php7.4-gmp php7.4-imagick >/dev/null
apt-get install -y php7.4-bcmath php7.4-cli php7.4-curl php7.4-common php7.4-fpm \
php7.4-gd php7.4-gmp php7.4-imagick php7.4-intl php7.4-json php7.4-mbstring \
php7.4-mysql php7.4-opcache php7.4-redis php7.4-xml php7.4-zip >/dev/null
echo -e "\n\033[4;32mGetting database ready\033[0;40m"
mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "CREATE DATABASE $MYSQL_DB_DATABASE;
+2 -2
View File
@@ -2,7 +2,7 @@
set -euo pipefail
# set version of vagrant to use :
vagrantversion=2.2.14
vagrantversion=2.2.15
mkdir -p $HOME/vagrant
pushd $HOME/vagrant > /dev/null
@@ -15,7 +15,7 @@ if [ ! -d "vagrant-$vagrantversion" ]; then
curl -Os https://releases.hashicorp.com/vagrant/${vagrantversion}/vagrant_${vagrantversion}_SHA256SUMS
curl -Os https://releases.hashicorp.com/vagrant/${vagrantversion}/vagrant_${vagrantversion}_SHA256SUMS.sig
gpg --keyserver keys.gnupg.net --recv-keys 51852D87348FFC4C
gpg --keyserver keys.gnupg.net --recv-keys 72D7468F
verif=0
if gpg --quiet --verify vagrant_${vagrantversion}_SHA256SUMS.sig vagrant_${vagrantversion}_SHA256SUMS 2>/dev/null; then