Enable Vagrant HTTPS, and create task for enabling HTTPS (#1239)

* Enable Vagrant HTTPS, and create task for enabling HTTPS * spacing
ChurchCRM · Oct 30, 2016 · 773656e · 773656e
1 parent dad0b48
commit 773656e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Service/TaskService.php b/src/Service/TaskService.php
@@ -31,6 +31,11 @@ function getAdminTasks() {
     if ($bRegistered != 1) {
       array_push($tasks, $this->addTask(gettext("Register Software"), $this->baseURL."/Register.php", true));
     }
+
+    if(!isset($_SERVER['HTTPS'])) {
+      array_push($tasks, $this->addTask(gettext("Configure HTTPS"), "http://docs.churchcrm.io/en/latest/", true));
+    }
+
     if ($sChurchName == "Some Church") {
       array_push($tasks, $this->addTask(gettext("Update Church Info"), $this->baseURL."/SystemSettings.php", true));
     }

diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
@@ -24,6 +24,9 @@ echo "==================   Apache Setup  ======================="
 echo "=========================================================="
 sudo sed -i 's/^upload_max_filesize.*$/upload_max_filesize = 2G/g' /etc/php5/apache2/php.ini
 sudo sed -i 's/^post_max_size.*$/post_max_size = 2G/g' /etc/php5/apache2/php.ini
+sudo sed -i 's/\/var\/www.*$/\/var\/www\/public/g' /etc/apache2/sites-available/default-ssl.conf
+sudo a2enmod ssl
+sudo a2ensite default-ssl
 sudo service apache2 restart
 
 echo "=========================================================="