MISP
/
misp-vagrant
mirror of https://github.com/MISP/misp-vagrant
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #11 from ninoseki/update-bootstrap.sh 

Update bootstrap.sh
main
Alexandre Dulaunoy 2019-08-29 11:24:29 +02:00 committed by GitHub
parent 39250bf897 3f9cef4be4
commit 272d29b024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Vagrantfile vendored
View File

@ -13,8 +13,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Every Vagrant virtual environment requires a box to build off of. # Every Vagrant virtual environment requires a box to build off of.
# config.vm.box = "ubuntu/artful64" # config.vm.box = "ubuntu/artful64"
config.vm.box = "fso/artful64" config.vm.box = "ubuntu/bionic64"
config.vm.provision :shell, path: "bootstrap.sh", args: "#{MISP_ENV}" config.vm.provision :shell, path: "bootstrap.sh", args: MISP_ENV.to_s
# Disable automatic box update checking. If you disable this, then # Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs # boxes will only be checked for updates when the user runs
@ -45,8 +45,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# the path on the guest to mount the folder. And the optional third # the path on the guest to mount the folder. And the optional third
# argument is a set of non-required options. # argument is a set of non-required options.
disabled = true disabled = true
vm_name = "MISP - Ubuntu 17.10" vm_name = "MISP - Ubuntu 18.04"
if "#{MISP_ENV}" == "dev" if MISP_ENV.to_s == "dev"
disabled = false disabled = false
vm_name.concat(" - DEV") vm_name.concat(" - DEV")
end end

6
bootstrap.sh
View File

@ -42,8 +42,7 @@ post_max_size=50M
max_execution_time=300 max_execution_time=300
max_input_time=223 max_input_time=223
memory_limit=512M memory_limit=512M
PHP_INI=/etc/php/7.1/apache2/php.ini PHP_INI=/etc/php/7.2/apache2/php.ini
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
export LANGUAGE=en_US.UTF-8 export LANGUAGE=en_US.UTF-8
@ -112,7 +111,8 @@ a2ensite default-ssl > /dev/null
echo "--- Installing PHP-specific packages… ---" echo "--- Installing PHP-specific packages… ---"
apt-get install -y libapache2-mod-php php php-cli php-crypt-gpg php-dev php-json php-mysql php-opcache php-readline php-redis php-xml > /dev/null apt-get install -y libapache2-mod-php php php-cli php-gnupg php-dev php-json php-mysql php-opcache php-readline php-redis php-xml php-mbstring php-gd > /dev/null
echo -e "\n--- Configuring PHP (sane PHP defaults)… ---\n" echo -e "\n--- Configuring PHP (sane PHP defaults)… ---\n"