update stream as of homestead v2.1.7

Author: yajra

scripts/blackfire.sh

@@ -26,4 +26,4 @@ echo "$client" > "/home/vagrant/.blackfire.ini"
 php5dismod xdebug
 service hhvm restart
 service php5-fpm restart
-service blackfire-agent restart
+service blackfire-agent restart

scripts/clear-nginx.sh

@@ -0,0 +1,4 @@
+# Clear The Old Nginx Sites
+
+rm -f /etc/nginx/sites-enabled/*
+rm -f /etc/nginx/sites-available/*

scripts/clear-variables.sh

@@ -0,0 +1,4 @@
+# Clear The Old Environment Variables
+
+sed -i '/# Set Homestead Environment Variable/,+1d' /home/vagrant/.profile
+sed -i '/env\[.*/,+1d' /etc/php5/fpm/php-fpm.conf

scripts/create-mysql.sh

@@ -2,5 +2,4 @@
 
 DB=$1;
 
-mysql -uhomestead -psecret -e "DROP DATABASE IF EXISTS \`$DB\`";
-mysql -uhomestead -psecret -e "CREATE DATABASE \`$DB\` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci";
+mysql -uhomestead -psecret -e "CREATE DATABASE IF NOT EXISTS \`$DB\` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci";

scripts/create-postgres.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 DB=$1;
-su postgres -c "dropdb $DB --if-exists"
+# su postgres -c "dropdb $DB --if-exists"
 su postgres -c "createdb -O homestead '$DB' || true"

scripts/homestead.rb

@@ -10,12 +10,19 @@ def Homestead.configure(config, settings, hostsupdater)
     config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
 
     # Configure The Box
-    config.vm.box = "laravel/homestead"
-    config.vm.hostname = "homestead"
+    config.vm.box = settings["box"] ||= "laravel/homestead"
+    config.vm.hostname = settings["hostname"] ||= "homestead"
 
     # Configure A Private Network IP
     config.vm.network :private_network, ip: settings["ip"] ||= "192.168.10.10"
 
+    # Configure Additional Networks
+    if settings.has_key?("networks")
+      settings["networks"].each do |network|
+        config.vm.network network["type"], ip: network["ip"], bridge: network["bridge"] ||= nil
+      end
+    end
+
     # Configure A Few VirtualBox Settings
     config.vm.provider "virtualbox" do |vb|
       vb.name = 'homestead-oracle'
@@ -29,13 +36,21 @@ def Homestead.configure(config, settings, hostsupdater)
     # Configure A Few VMware Settings
     ["vmware_fusion", "vmware_workstation"].each do |vmware|
       config.vm.provider vmware do |v|
-        v.vmx["displayName"] = "homestead"
+        v.vmx["displayName"] = "homestead-oracle"
         v.vmx["memsize"] = settings["memory"] ||= 2048
         v.vmx["numvcpus"] = settings["cpus"] ||= 1
         v.vmx["guestOS"] = "ubuntu-64"
       end
     end
 
+    # Configure A Few Parallels Settings
+    config.vm.provider "parallels" do |v|
+      v.update_guest_tools = true
+      v.optimize_power_consumption = false
+      v.memory = settings["memory"] ||= 2048
+      v.cpus = settings["cpus"] ||= 1
+    end
+
     # enable/disable vbguest update
     config.vbguest.auto_update = false
 
@@ -58,17 +73,37 @@ def Homestead.configure(config, settings, hostsupdater)
       s.path = "./scripts/install-oci8.sh"
     end
 
-    # Configure Port Forwarding To The Box
-    config.vm.network "forwarded_port", guest: 80, host: 8000
-    config.vm.network "forwarded_port", guest: 443, host: 44300
-    config.vm.network "forwarded_port", guest: 3306, host: 33060
-    config.vm.network "forwarded_port", guest: 5432, host: 54320
-    config.vm.network "forwarded_port", guest: 1521, host: 1521
+    # Standardize Ports Naming Schema
+    if (settings.has_key?("ports"))
+      settings["ports"].each do |port|
+        port["guest"] ||= port["to"]
+        port["host"] ||= port["send"]
+        port["protocol"] ||= "tcp"
+      end
+    else
+      settings["ports"] = []
+    end
+
+    # Default Port Forwarding
+    default_ports = {
+      80   => 8000,
+      443  => 44300,
+      3306 => 33060,
+      5432 => 54320,
+      1521 => 1521
+    }
+
+    # Use Default Port Forwarding Unless Overridden
+    default_ports.each do |guest, host|
+      unless settings["ports"].any? { |mapping| mapping["guest"] == guest }
+        config.vm.network "forwarded_port", guest: guest, host: host, auto_correct: true
+      end
+    end
 
     # Add Custom Ports From Configuration
     if settings.has_key?("ports")
       settings["ports"].each do |port|
-        config.vm.network "forwarded_port", guest: port["guest"] || port["to"], host: port["host"] || port["send"], protocol: port["protocol"] ||= "tcp"
+        config.vm.network "forwarded_port", guest: port["guest"], host: port["host"], protocol: port["protocol"], auto_correct: true
       end
     end
 
@@ -94,39 +129,55 @@ def Homestead.configure(config, settings, hostsupdater)
     # Register All Of The Configured Shared Folders
     if settings.include? 'folders'
       settings["folders"].each do |folder|
-        mount_opts = folder["type"] == "nfs" ? ['actimeo=1'] : []
+        mount_opts = []
+
+        if (folder["type"] == "nfs")
+            mount_opts = folder["mount_opts"] ? folder["mount_opts"] : ['actimeo=1']
+        end
+
         config.vm.synced_folder folder["map"], folder["to"], type: folder["type"] ||= nil, mount_options: mount_opts
       end
     end
 
     # Install All The Configured Nginx Sites
+    config.vm.provision "shell" do |s|
+        s.path = scriptDir + "/clear-nginx.sh"
+    end
+
     settings["sites"].each do |site|
-      config.vm.provision "shell" do |s|
-          if (site.has_key?("hhvm") && site["hhvm"])
-            s.path = scriptDir + "/serve-hhvm.sh"
-            s.args = [site["map"], site["to"], site["port"] ||= "80", site["ssl"] ||= "443"]
-          else
-            s.path = scriptDir + "/serve.sh"
-            s.args = [site["map"], site["to"], site["port"] ||= "80", site["ssl"] ||= "443"]
-          end
+      type = site["type"] ||= "laravel"
+
+      if (site.has_key?("hhvm") && site["hhvm"])
+        type = "hhvm"
       end
-    end
 
-    # Configure All Of The Configured Databases
-    settings["databases"].each do |db|
-      config.vm.provision "shell" do |s|
-        s.path = scriptDir + "/create-mysql.sh"
-        s.args = [db]
+      if (type == "symfony")
+        type = "symfony2"
       end
 
       config.vm.provision "shell" do |s|
-        s.path = scriptDir + "/create-postgres.sh"
-        s.args = [db]
+        s.path = scriptDir + "/serve-#{type}.sh"
+        s.args = [site["map"], site["to"], site["port"] ||= "80", site["ssl"] ||= "443"]
       end
+    end
 
-      config.vm.provision "shell" do |s|
-        s.path = scriptDir + "/create-oracle.sh"
-        s.args = [db]
+    # Configure All Of The Configured Databases
+    if settings.has_key?("databases")
+      settings["databases"].each do |db|
+        config.vm.provision "shell" do |s|
+          s.path = scriptDir + "/create-mysql.sh"
+          s.args = [db]
+        end
+
+        config.vm.provision "shell" do |s|
+          s.path = scriptDir + "/create-postgres.sh"
+          s.args = [db]
+        end
+
+        config.vm.provision "shell" do |s|
+          s.path = scriptDir + "/create-oracle.sh"
+          s.args = [db]
+        end
       end
     end
 
@@ -140,6 +191,10 @@ def Homestead.configure(config, settings, hostsupdater)
     end
 
     # Configure All Of The Server Environment Variables
+    config.vm.provision "shell" do |s|
+        s.path = scriptDir + "/clear-variables.sh"
+    end
+
     if settings.has_key?("variables")
       settings["variables"].each do |var|
         config.vm.provision "shell" do |s|
@@ -148,7 +203,7 @@ def Homestead.configure(config, settings, hostsupdater)
         end
 
         config.vm.provision "shell" do |s|
-            s.inline = "echo \"\n#Set Homestead environment variable\nexport $1=$2\" >> /home/vagrant/.profile"
+            s.inline = "echo \"\n# Set Homestead Environment Variable\nexport $1=$2\" >> /home/vagrant/.profile"
             s.args = [var["key"], var["value"]]
         end
       end

scripts/serve-hhvm.sh

@@ -7,39 +7,7 @@ openssl x509 -req -days 365 -in /etc/nginx/ssl/$1.csr -signkey /etc/nginx/ssl/$1
 
 block="server {
     listen ${3:-80};
-    server_name $1;
-    root \"$2\";
-
-    index index.html index.htm index.php;
-
-    charset utf-8;
-
-    location / {
-        try_files \$uri \$uri/ /index.php?\$query_string;
-    }
-
-    location = /favicon.ico { access_log off; log_not_found off; }
-    location = /robots.txt  { access_log off; log_not_found off; }
-
-    access_log off;
-    error_log  /var/log/nginx/$1-error.log error;
-
-    sendfile off;
-
-    location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
-        include fastcgi_params;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-}
-server {
-    listen ${4:-443};
+    listen ${4:-443} ssl;
     server_name $1;
     root \"$2\";
 
@@ -71,7 +39,6 @@ server {
         deny all;
     }
 
-    ssl on;
     ssl_certificate     /etc/nginx/ssl/$1.crt;
     ssl_certificate_key /etc/nginx/ssl/$1.key;
 }

scripts/serve-laravel.sh

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+mkdir /etc/nginx/ssl 2>/dev/null
+openssl genrsa -out "/etc/nginx/ssl/$1.key" 1024 2>/dev/null
+openssl req -new -key /etc/nginx/ssl/$1.key -out /etc/nginx/ssl/$1.csr -subj "/CN=$1/O=Vagrant/C=UK" 2>/dev/null
+openssl x509 -req -days 365 -in /etc/nginx/ssl/$1.csr -signkey /etc/nginx/ssl/$1.key -out /etc/nginx/ssl/$1.crt 2>/dev/null
+
+block="server {
+    listen ${3:-80};
+    listen ${4:-443} ssl;
+    server_name $1;
+    root \"$2\";
+
+    index index.html index.htm index.php;
+
+    charset utf-8;
+
+    location / {
+        try_files \$uri \$uri/ /index.php?\$query_string;
+    }
+
+    location = /favicon.ico { access_log off; log_not_found off; }
+    location = /robots.txt  { access_log off; log_not_found off; }
+
+    access_log off;
+    error_log  /var/log/nginx/$1-error.log error;
+
+    sendfile off;
+
+    client_max_body_size 100m;
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass unix:/var/run/php5-fpm.sock;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+        fastcgi_connect_timeout 300;
+        fastcgi_send_timeout 300;
+        fastcgi_read_timeout 300;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+
+    ssl_certificate     /etc/nginx/ssl/$1.crt;
+    ssl_certificate_key /etc/nginx/ssl/$1.key;
+}
+"
+
+echo "$block" > "/etc/nginx/sites-available/$1"
+ln -fs "/etc/nginx/sites-available/$1" "/etc/nginx/sites-enabled/$1"
+service nginx restart
+service php5-fpm restart

scripts/serve-symfony2.sh

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+mkdir /etc/nginx/ssl 2>/dev/null
+openssl genrsa -out "/etc/nginx/ssl/$1.key" 1024 2>/dev/null
+openssl req -new -key /etc/nginx/ssl/$1.key -out /etc/nginx/ssl/$1.csr -subj "/CN=$1/O=Vagrant/C=UK" 2>/dev/null
+openssl x509 -req -days 365 -in /etc/nginx/ssl/$1.csr -signkey /etc/nginx/ssl/$1.key -out /etc/nginx/ssl/$1.crt 2>/dev/null
+
+block="server {
+    listen ${3:-80};
+    listen ${4:-443} ssl;
+    server_name $1;
+    root \"$2\";
+
+    index index.html index.htm index.php app.php;
+
+    charset utf-8;
+
+    location / {
+        try_files \$uri \$uri/ /app.php?\$query_string;
+    }
+
+    location = /favicon.ico { access_log off; log_not_found off; }
+    location = /robots.txt  { access_log off; log_not_found off; }
+
+    access_log off;
+    error_log  /var/log/nginx/$1-ssl-error.log error;
+
+    sendfile off;
+
+    client_max_body_size 100m;
+
+    # DEV
+    location ~ ^/(app_dev|config)\.php(/|\$) {
+        fastcgi_split_path_info ^(.+\.php)(/.+)\$;
+        fastcgi_pass unix:/var/run/php5-fpm.sock;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+    }
+
+    # PROD
+    location ~ ^/app\.php(/|$) {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass unix:/var/run/php5-fpm.sock;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+        # Prevents URIs that include the front controller. This will 404:
+        # http://domain.tld/app.php/some-path
+        # Remove the internal directive to allow URIs like this
+        internal;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+
+    ssl_certificate     /etc/nginx/ssl/$1.crt;
+    ssl_certificate_key /etc/nginx/ssl/$1.key;
+}
+"
+
+echo "$block" > "/etc/nginx/sites-available/$1"
+ln -fs "/etc/nginx/sites-available/$1" "/etc/nginx/sites-enabled/$1"
+service nginx restart
+service php5-fpm restart

scripts/wilcard.sh

@@ -0,0 +1,2 @@
+sudo openssl req -new -x509 -keyout cert.pem -out cert.pem -days 365 -nodes -subj '/C=US/ST=New York/L=New York/O=End Point/OU=Hosting Team/CN=leadrm.app emailAddress=aqangeles@gmail.com/ subjectAltName=DNS.1=leadrm.app, DNS.2=*.leadrm.app'
+sudo openssl req -new -x509 -keyout cert.pem -out cert.pem -days 365 -nodes