Merge branch 'release/3.1.0'

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to the REDCap Deployment project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## [3.1.0] - 2019-05-14
+### Changed
+- Change base os to debian stretch in the env file. (Marly Cormar)
+- Installing exim4 as some packages are not by default installed. (Marly Cormar)
+- Install dirmngr and update the source repos. (Marly Cormar)
+- Remove obsolete hooks config. (Marly Cormar)
+
+
 ## [3.0.2] - 2019-04-03
 ### Changed
 - Remove vagrant-triggers installation instructions. (Marly Cormar)

bootstrap.sh

@@ -38,10 +38,10 @@ cd /etc/apt/
 netselect-apt -c US > ~/netselect-apt.log 2>&1
 
 # Setting oldstable debian repository
-echo "deb http://debian.gtisc.gatech.edu/debian/ oldstable main contrib" > /etc/apt/sources.list
-echo "deb-src http://debian.gtisc.gatech.edu/debian/ oldstable main contrib" >> /etc/apt/sources.list
-echo "deb http://security.debian.org/ oldstable/updates main contrib" >> /etc/apt/sources.list
-echo "deb-src http://security.debian.org/ oldstable/updates main contrib" >> /etc/apt/sources.list
+echo "deb http://deb.debian.org/debian stretch main contrib" > /etc/apt/sources.list
+echo "deb-src http://deb.debian.org/debian stretch main contrib" >> /etc/apt/sources.list
+echo "deb http://deb.debian.org/debian stretch-updates main contrib" >> /etc/apt/sources.list
+echo "deb-src http://deb.debian.org/debian stretch-updates main contrib" >> /etc/apt/sources.list
 
 # Update our repos
 log "Updating apt package indicies..."

bootstrap_functions.sh

@@ -42,18 +42,19 @@ function install_prereqs() {
         DATABASE_ROOT_PASS=$2
     fi
 
+    apt-get install -y dirmngr --install-recommends
 
     # Try two different keyservers to get the MySQL repository key
     gpg --keyserver pgp.mit.edu --recv-keys 5072E1F5 || gpg --keyserver sks-keyservers.net --recv-keys 5072E1F5
     gpg -a --export 5072E1F5 | apt-key add -
 
 cat << END > /etc/apt/sources.list.d/mysql.list
-deb http://repo.mysql.com/apt//debian/ jessie $MYSQL_REPO
-deb-src http://repo.mysql.com/apt//debian/ jessie $MYSQL_REPO
+deb http://repo.mysql.com/apt/debian/ stretch $MYSQL_REPO
+deb-src http://repo.mysql.com/apt/debian/ stretch $MYSQL_REPO
 END
 
     log "Adding php7.2 repo to prepare for installation..."
-    sudo apt-get install apt-transport-https lsb-release ca-certificates
+    sudo apt-get install -y apt-transport-https lsb-release ca-certificates
     sudo wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
     echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/php.list
 
@@ -317,7 +318,7 @@ function create_tables() {
 function install_xdebug() {
     # Install XDebug for enabling code coverage
     log "Executing: install_xdebug()"
-    apt-get install php7.2-xdebug
+    apt-get install -y php7.2-xdebug
 
     echo 'Restarting apache server'
     service apache2 restart
@@ -386,7 +387,8 @@ function reset_db {
 }
 
 function configure_exim4() {
-    echo "Configuring exim4..."
+    echo "Installing and configuring exim4..."
+    apt-get install -y exim4
 cat << EOF > /etc/exim4/update-exim4.conf.conf
 dc_eximconfig_configtype='satellite'
 dc_other_hostnames='localhost'

example.env.txt

@@ -4,7 +4,7 @@ URL_OF_DEPLOYED_APP=http://redcap.test/redcap
 HOSTNAME_IN_HOST=redcap.test
 PATH_TO_APP_IN_GUEST_FILESYSTEM=/var/www/redcap
 APP_PARENT_FOLDER_IN_GUEST_FILESYSTEM=/var/www
-CONFIG_VM_BOX=puppetlabs/debian-8.2-64-nocm
+CONFIG_VM_BOX=debian/stretch64
 VM_IP=192.168.33.113
 FORWARDED_PORT_443=56113
 FORWARDED_PORT_80=46113
@@ -31,5 +31,4 @@ max_input_vars=10000
 upload_max_filesize=32M
 post_max_size=32M
 
-HOOKS_CONFIGURATION=redcap.test
 SHIB=0