bonethug 0.0.88 → 0.0.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce96dd65bf299a1277f640f466f97d9ef588dd8
-  data.tar.gz: f712f57099087df2a5637a1df0f007ec2c306585
+  metadata.gz: a71cdb3758ee1915ac34ab3fb16eae6ee884eacc
+  data.tar.gz: 2f4c876a1b86f6755a5f66dc54c9775c090f869a
 SHA512:
-  metadata.gz: be9bf43739da5189f46932119000256d890a77e6cf4ce8b06306fe9c731ec67077469732b42e584a4cecea9d7e590f07c6757f1e7143e7ffa36c4a2f933b454a
-  data.tar.gz: 95a6da3541929cbb055bd1966786ab76566f391db6d44af99798d3b53f7493b6a929aed27aa859a8de6e7199480de9be43f57a4d8c1969bb8cd74f6fdc54b9d9
+  metadata.gz: 226e48016738db0286b52f9e7fff1f21439fea15eb8eb3830bb4007a59728d39758f72e2cf808a484bb6d0b608478eaca72f81679512b399f56f28cff349467a
+  data.tar.gz: 8921f1c592f9d59804f91eddc5a98c2f504b9cdf612d529793cd70e2b7925ef50bf0ad0601c676d7eb80fda3552382cb0c1dfc47b0e4a1f7e0e2043a35878de0

data/TODO.txt

@@ -10,4 +10,5 @@
 - nagios?
 - need more modular configuration of server components for setup scripts
 - thug vhost-local and thug deploy could share more code
-- log rotate
+- log rotate
+- SSL support

data/config/cnf.yml

@@ -138,6 +138,9 @@ vhost:
     conf_path: /etc/apache2/sites-available
     type: apache
     version: 2.4
+    ssl_key: /etc/ssl/private/ssl-cert-snakeoil.key
+    ssl_crt: /etc/ssl/certs/ssl-cert-snakeoil.pem
+    ssl_ca_bundle:
     server_name: production.domain.com
     server_aliases:
       - www.production.domain.com

data/config/deploy.rb

@@ -143,11 +143,16 @@ task :setup => :environment do
 
 end
 
+desc "Run task"
+task :run_task do
+  queue! %[export APPLICATION_ENV=#{env} && export RAILS_ENV=#{env} && cd "#{deploy_to}/current" && #{ENV['task']}]
+end
+
 desc "Updates bundled dependencies"
 task :update_packages => :environment do
-  invoke :'bundle:update'
-  queue! %[php #{deploy_to}/shared/composer.phar update] if use_composer
-  queue! %[php #{deploy_to}/current/public/framework/cli-script.php dev/build] if ['silverstripe','silverstripe3'].include? deploy.get('project_type') 
+  queue! %[cd "#{deploy_to}/current" && bundle update]
+  queue! %[php "#{deploy_to}/shared/composer.phar" update] if use_composer
+  queue! %[php "#{deploy_to}/current/public/framework/cli-script.php" dev/build] if ['silverstripe','silverstripe3'].include? deploy.get('project_type')
 end
 
 desc "Sets up an environment"
@@ -170,8 +175,15 @@ task :init_db => :environment do
     dbs.each do |name,envs|
       if envs
         db = envs.get env
-        cmd = Bonethug::Installer.init_mysql_db_script db, ENV['admin_user'], ENV['admin_pass']
-        queue! %[#{cmd}]
+        if !db
+          puts "No db for env " + env + " found - check your config file"
+          exit
+        else
+          puts "Mysql user " + ENV['admin_user'] + " is creating db: " + db.get('name') + " and granting access to " + db.get('user') + "@" + db.get('host') + ", you may be prompted for the password for the user: " + ENV['admin_user']
+          puts "NB: You may be affected by this bug if your admin user pass is longer than 8 chars: http://dev.mysql.com/doc/refman/5.0/en/password-too-long.html"
+          cmd = Bonethug::Installer.init_mysql_db_script db, ENV['admin_user'], ENV['admin_pass']
+          queue! %[#{cmd}]
+        end
       end
     end
   end

data/lib/bonethug/cli.rb

@@ -241,7 +241,7 @@ module Bonethug
         else
           case task
           when 'rake'
-            cmd_task = 'rake'
+            cmd_task = 'bundle exec rake'
           when 'drush', 'drush-local'
             cmd_task = File.expand_path('./vendor/drush/drush/drush') + ' -r ' + File.expand_path('./public')
           when 'sake'
@@ -260,7 +260,7 @@ module Bonethug
         else
 
           # build command
-          run = "\"run[#{cmd_task} #{args.join(' ')}]\""
+          run = "run_task task=\"#{cmd_task} #{args.join(' ')}\""
 
           # do it!
           exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb #{run} --verbose"

data/lib/bonethug/configurator.rb

@@ -35,7 +35,7 @@ module Bonethug
 
       # server aliases
       server_aliases = ''
-      aliases = vh_cnf.get('server_aliases')
+      aliases = vh_cnf.get 'server_aliases'
       if aliases
         aliases.each do |index, server_alias|
           server_aliases += 'ServerAlias ' + server_alias + "\n"
@@ -52,13 +52,26 @@ module Bonethug
       end
 
       # server admin
-      admin = vh_cnf.get('server_admin')
+      admin = vh_cnf.get 'server_admin'
       server_admin = admin ? 'ServerAdmin ' + admin : ''
 
       # paths
       shared_path = is_remote ? '/shared' : ''
       current_path = is_remote ? '/current' : ''
 
+      # ssl key
+      ssl_key = vh_cnf.get 'ssl_key'
+      ssl_key = base_path + current_path + '/' + ssl_key if ssl_key and ssl_key[0...0] != '/'
+
+      # ssl crt
+      ssl_crt = vh_cnf.get 'ssl_crt'
+      ssl_crt = base_path + current_path + '/' + ssl_crt if ssl_crt and ssl_crt[0...0] != '/'
+
+      # ssl crt
+      ssl_ca_bundle = vh_cnf.get 'ssl_ca_bundle'
+      ssl_ca_bundle = base_path + current_path + '/' + ssl_ca_bundle if ssl_ca_bundle and ssl_ca_bundle[0...0] != '/'
+      ca_str = ssl_ca_bundle ? 'SSLCertificateChainFile ' + ssl_ca_bundle : ''
+
       case vh_cnf.get('type')
 
       when "nginx"
@@ -96,6 +109,49 @@ module Bonethug
 
           </VirtualHost>
         "
+
+        if ssl_key and ssl_crt
+
+          vh += "
+            <VirtualHost *:443>
+
+              ServerName  #{vh_cnf.get('server_name')}
+              #{server_aliases}
+
+              #{server_admin}
+
+              DocumentRoot #{base_path + current_path}/public
+
+              #{env_vars}
+              PassEnv PATH
+
+              SSLEngine on
+              SSLCertificateFile #{ssl_crt}
+              SSLCertificateKeyFile #{ssl_key}
+              #{ca_str}
+
+              CustomLog #{base_path + shared_path}/log/bytes.log bytes
+              CustomLog #{base_path + shared_path}/log/combined.log combined
+              ErrorLog  #{base_path + shared_path}/log/error.log
+
+              <Directory #{base_path + current_path}/public>
+
+                SSLOptions +StdEnvVars
+                Options Indexes MultiViews FollowSymLinks
+                AllowOverride All
+                #{access}
+
+              </Directory>
+
+              BrowserMatch \"MSIE [2-6]\" \
+                              nokeepalive ssl-unclean-shutdown \
+                              downgrade-1.0 force-response-1.0
+              BrowserMatch \"MSIE [17-9]\" ssl-unclean-shutdown
+
+            </VirtualHost>
+          "
+
+        end
       end
 
       vh

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.88"
-          BUILD_DATE = "2014-08-12 20:19:45 +1200"
+          VERSION = "0.0.89"
+          BUILD_DATE = "2014-09-30 11:34:00 +1300"
         end
       

data/scripts/mail

@@ -1,4 +1,4 @@
-# /bin/bash
+#!/bin/bash
 
 cd /usr/share && sudo git clone https://github.com/joshdata/mailinabox
 sudo bash mailinabox/setup/start.sh

data/scripts/npm-bower

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # install npm
 sudo apt-get update && sudo apt-get upgrade
 sudo apt-get install g++ curl libssl-dev apache2-utils git-core

data/scripts/postgres

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+sudo apt-get install postgresql-9.3 phppgadmin
+sudo cp /etc/apache2/conf.d/phppgadmin /etc/apache2/conf-available/phppgadmin.conf
+sudo sed -i -e "s/allow from 127.0.0.0\/255.0.0.0 ::1\/128/allow from all/g" /etc/apache2/conf-available/phppgadmin.conf
+sudo a2enconf phppgadmin.conf
+sudo service apache2 reload

data/scripts/ubuntu-12.04

@@ -1,4 +1,4 @@
-# /bin/bash
+#!/bin/bash
 
 # -----------------------------------------------------
 # install native stuff
@@ -70,141 +70,12 @@ sudo sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g"
 sudo mysql_secure_installation
 
 # node
-sudo ln -s /usr/bin/node /usr/bin/nodejs
+sudo ln -s /usr/bin/nodejs /usr/bin/node
 
 # ruby
 update-alternatives --set gem /usr/bin/gem2.1
 update-alternatives --set ruby /usr/bin/ruby2.1
-# /bin/bash
 
-# -----------------------------------------------------
-# install native stuff
-# -----------------------------------------------------
-
-# install the repo adding scripts
-sudo apt-get install software-properties-common python-software-properties
-
-# add repos
-# sudo add-apt-repository ppa:richarvey/nodejs
-sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
-sudo add-apt-repository "deb-src http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
-sudo apt-add-repository ppa:brightbox/ruby-ng
-sudo add-apt-repository ppa:ondrej/apache2
-sudo add-apt-repository ppa:ondrej/php5
-sudo add-apt-repository ppa:ondrej/mysql-5.6
-
-# update
-sudo apt-get update && sudo apt-get upgrade
-
-# install
-
-# dev headers
-sudo apt-get install libcurl4-openssl-dev libssl-dev apache2-threaded-dev libapr1-dev libaprutil1-dev libapr1-dev libaprutil1-dev ruby2.1-dev
-sudo apt-get install libmysqlclient-dev libmagickwand-dev libsqlite3-dev libxml2-dev libxslt1-dev
-
-# regular packages
-sudo apt-get install apache2-mpm-worker
-sudo apt-get install libapache2-mod-qos libapache2-mod-spamhaus libapache2-mod-fastcgi libapache2-mod-evasive
-sudo apt-get install curl php5-fpm php5 php5-cli php5-curl php5-gd php5-imagick php-apc php5-mysql
-sudo apt-get install mysql-server mysql-client sqlite3
-sudo apt-get install imagemagick
-sudo apt-get install phpmyadmin
-sudo apt-get install sshpass
-sudo apt-get install libxml2 g++
-sudo apt-get install git ruby2.1 wkhtmltopdf nodejs npm at
-
-
-# -----------------------------------------------------
-# Configure stuff
-# -----------------------------------------------------
-
-# unix socket
-# echo "
-# <IfModule mod_fastcgi.c>
-#   AddHandler php5-fcgi .php
-#   Action php5-fcgi /php5-fcgi
-#   Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-#   FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
-# </IfModule>
-# " > /etc/apache2/conf.d/php-fpm.conf
-# sed -i -e "s/listen = 127.0.0.1:9000/listen = \/var\/run\/php5-fpm.sock/g" /etc/php5/fpm/pool.d/www.conf
-
-## TCP
-# echo "
-# <IfModule mod_fastcgi.c>
-#   AddHandler php5-fcgi .php
-#   Action php5-fcgi /php5-fcgi
-#   Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-#   FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -idle-timeout 250 -pass-header Authorization
-# </IfModule>
-# " > /etc/apache2/conf.d/php-fpm.conf
-# sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
-
-# php
-sudo sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
-
-# secure mysql install
-sudo mysql_secure_installation
-
-# node
-sudo ln -s /usr/bin/node /usr/bin/nodejs
-
-# ruby
-update-alternatives --set gem /usr/bin/gem2.1
-update-alternatives --set ruby /usr/bin/ruby2.1
-
-# Apache
-# ------
-
-# config modules
-
-# php fpm
-sudo echo -e "<IfModule mod_fastcgi.c>\n AddHandler php5-fcgi .php\n Action php5-fcgi /php5-fcgi\n Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi\n FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -idle-timeout 250 -pass-header Authorization\n <Directory />\nRequire all granted\n </Directory>\n </IfModule>" > /etc/apache2/conf-available/php-fpm.conf
-sudo a2enconf php-fpm.conf
-
-# DDoS Protection
-sudo mkdir -p /var/log/apache2/evasive
-sudo chown -R www-data:root /var/log/apache2/evasive
-sudo echo -e "<IfModule mod_spamhaus.c>\n  DOSHashTableSize 2048\n  DOSPageCount 20  # maximum number of requests for the same page\n  DOSSiteCount 300  # total number of requests for any object by the same client IP on the same listener\n  DOSPageInterval 1.0 # interval for the page count threshold\n  DOSSiteInterval 1.0  # interval for the site count threshold\n  DOSBlockingPeriod 10.0 # time that a client IP will be blocked for\n  DOSLogDir “/var/log/apache2/evasive”\n  DOSEmailNotify root@localhost\n</IfModule>" > /etc/apache2/conf-available/mod-evasive.conf
-sudo a2enconf mod-evasive.conf
-
-# DNS Injection
-sudo touch /etc/spamhaus.wl
-sudo echo -e "<IfModule mod_spamhaus.c>\n  MS_METHODS POST,PUT,OPTIONS,CONNECT\n  MS_WhiteList /etc/spamhaus.wl\n  MS_CacheSize 256\n</IfModule>" > /etc/apache2/conf-available/spamhaus.conf
-sudo a2enconf spamhauf.conf
-
-# enable modules
-sudo a2enmod actions fastcgi alias rewrite headers qos spamhaus evasive cache cache_disk
-
-# phpmyadmin apache 2.4
-sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
-sudo a2enconf phpmyadmin.conf
-
-# -----------------------------------------------------
-# Install Gems
-# -----------------------------------------------------
-
-# install some gems - yes gem1.9.3 - wtf - use rbenv
-# sudo gem1.9.3 install mina bundler whenever astrails-safe
-
-# install passenger
-sudo gem install passenger
-sudo passenger-install-apache2-module
-sudo touch /etc/apache2/mods-available/passenger.load
-sudo touch /etc/apache2/mods-available/passenger.confc
-
-# -----------------------------------------------------
-# Node.js related
-# -----------------------------------------------------
-
-sudo npm install bower -g
-
-# -----------------------------------------------------
-# Restart stuff
-# -----------------------------------------------------
-
-sudo service apache2 restart
-sudo service php5-fpm restart
 # Apache
 # ------
 
@@ -226,7 +97,7 @@ sudo echo -e "<IfModule mod_spamhaus.c>\n  MS_METHODS POST,PUT,OPTIONS,CONNECT\n
 sudo a2enconf spamhauf.conf
 
 # enable modules
-sudo a2enmod actions fastcgi alias rewrite headers qos spamhaus evasive cache cache_disk
+sudo a2enmod actions fastcgi alias rewrite headers qos spamhaus evasive cache cache_disk ssl
 
 # phpmyadmin apache 2.4
 sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
@@ -237,7 +108,7 @@ sudo a2enconf phpmyadmin.conf
 # -----------------------------------------------------
 
 # install some gems - yes gem1.9.3 - wtf - use rbenv
-# sudo gem1.9.3 install mina bundler whenever astrails-safe
+sudo gem install bundler
 
 # install passenger
 sudo gem install passenger

data/scripts/ubuntu-14.04

@@ -1,86 +1,12 @@
-# /bin/bash
+#!/bin/bash
 
 # -----------------------------------------------------
 # install native stuff
 # -----------------------------------------------------
 
-# install the repo adding scripts
-sudo apt-get install software-properties-common python-software-properties
-
-# add repos
-# sudo add-apt-repository ppa:richarvey/nodejs
-sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
-sudo add-apt-repository "deb-src http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
-sudo apt-add-repository ppa:brightbox/ruby-ng
-sudo add-apt-repository ppa:ondrej/apache2
-sudo add-apt-repository ppa:ondrej/php5
-sudo add-apt-repository ppa:ondrej/mysql-5.6
-
 # update
 sudo apt-get update && sudo apt-get upgrade
 
-# install
-
-# dev headers
-sudo apt-get install libcurl4-openssl-dev libssl-dev apache2-threaded-dev libapr1-dev libaprutil1-dev libapr1-dev libaprutil1-dev ruby2.1-dev
-sudo apt-get install libmysqlclient-dev libmagickwand-dev libsqlite3-dev libxml2-dev libxslt1-dev
-
-# regular packages
-sudo apt-get install apache2-mpm-workery
-sudo apt-get install libapache2-mod-qos libapache2-mod-spamhaus libapache2-mod-fastcgi libapache2-mod-evasive
-sudo apt-get install curl php5-fpm php5 php5-cli php5-curl php5-gd php5-imagick php-apc php5-mysql
-sudo apt-get install mysql-server mysql-client sqlite3
-sudo apt-get install imagemagick
-sudo apt-get install phpmyadmin
-sudo apt-get install sshpass
-sudo apt-get install libxml2 g++
-sudo apt-get install git ruby2.1 wkhtmltopdf nodejs npm at
-
-
-# -----------------------------------------------------
-# Configure stuff
-# -----------------------------------------------------
-
-# unix socket
-# echo "
-# <IfModule mod_fastcgi.c>
-#   AddHandler php5-fcgi .php
-#   Action php5-fcgi /php5-fcgi
-#   Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-#   FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
-# </IfModule>
-# " > /etc/apache2/conf.d/php-fpm.conf
-# sed -i -e "s/listen = 127.0.0.1:9000/listen = \/var\/run\/php5-fpm.sock/g" /etc/php5/fpm/pool.d/www.conf
-
-## TCP
-# echo "
-# <IfModule mod_fastcgi.c>
-#   AddHandler php5-fcgi .php
-#   Action php5-fcgi /php5-fcgi
-#   Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-#   FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -idle-timeout 250 -pass-header Authorization
-# </IfModule>
-# " > /etc/apache2/conf.d/php-fpm.conf
-# sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
-
-# php
-sudo sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
-
-# secure mysql install
-sudo mysql_secure_installation
-
-# node
-sudo ln -s /usr/bin/node /usr/bin/nodejs
-
-# ruby
-update-alternatives --set gem /usr/bin/gem2.1
-update-alternatives --set ruby /usr/bin/ruby2.1
-# /bin/bash
-
-# -----------------------------------------------------
-# install native stuff
-# -----------------------------------------------------
-
 # install the repo adding scripts
 sudo apt-get install software-properties-common python-software-properties
 
@@ -147,64 +73,13 @@ sudo sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g"
 sudo mysql_secure_installation
 
 # node
-sudo ln -s /usr/bin/node /usr/bin/nodejs
+sudo ln -s /usr/bin/nodejs /usr/bin/node
 
 # ruby
 update-alternatives --set gem /usr/bin/gem2.1
 update-alternatives --set ruby /usr/bin/ruby2.1
 
-# Apache
-# ------
-
-# config modules
-
-# php fpm
-sudo echo -e "<IfModule mod_fastcgi.c>\n AddHandler php5-fcgi .php\n Action php5-fcgi /php5-fcgi\n Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi\n FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -idle-timeout 250 -pass-header Authorization\n <Directory />\nRequire all granted\n </Directory>\n </IfModule>" > /etc/apache2/conf-available/php-fpm.conf
-sudo a2enconf php-fpm.conf
-
-# DDoS Protection
-sudo mkdir -p /var/log/apache2/evasive
-sudo chown -R www-data:root /var/log/apache2/evasive
-sudo echo -e "<IfModule mod_spamhaus.c>\n  DOSHashTableSize 2048\n  DOSPageCount 20  # maximum number of requests for the same page\n  DOSSiteCount 300  # total number of requests for any object by the same client IP on the same listener\n  DOSPageInterval 1.0 # interval for the page count threshold\n  DOSSiteInterval 1.0  # interval for the site count threshold\n  DOSBlockingPeriod 10.0 # time that a client IP will be blocked for\n  DOSLogDir “/var/log/apache2/evasive”\n  DOSEmailNotify root@localhost\n</IfModule>" > /etc/apache2/conf-available/mod-evasive.conf
-sudo a2enconf mod-evasive.conf
-
-# DNS Injection
-sudo touch /etc/spamhaus.wl
-sudo echo -e "<IfModule mod_spamhaus.c>\n  MS_METHODS POST,PUT,OPTIONS,CONNECT\n  MS_WhiteList /etc/spamhaus.wl\n  MS_CacheSize 256\n</IfModule>" > /etc/apache2/conf-available/spamhaus.conf
-sudo a2enconf spamhauf.conf
 
-# enable modules
-sudo a2enmod actions fastcgi alias rewrite headers qos spamhaus evasive cache cache_disk
-
-# phpmyadmin apache 2.4
-sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
-sudo a2enconf phpmyadmin.conf
-
-# -----------------------------------------------------
-# Install Gems
-# -----------------------------------------------------
-
-# install some gems - yes gem1.9.3 - wtf - use rbenv
-# sudo gem1.9.3 install mina bundler whenever astrails-safe
-
-# install passenger
-sudo gem install passenger
-sudo passenger-install-apache2-module
-sudo touch /etc/apache2/mods-available/passenger.load
-sudo touch /etc/apache2/mods-available/passenger.confc
-
-# -----------------------------------------------------
-# Node.js related
-# -----------------------------------------------------
-
-sudo npm install bower -g
-
-# -----------------------------------------------------
-# Restart stuff
-# -----------------------------------------------------
-
-sudo service apache2 restart
-sudo service php5-fpm restart
 # Apache
 # ------
 
@@ -217,7 +92,7 @@ sudo a2enconf php-fpm.conf
 # DDoS Protection
 sudo mkdir -p /var/log/apache2/evasive
 sudo chown -R www-data:root /var/log/apache2/evasive
-sudo echo -e "<IfModule mod_spamhaus.c>\n  DOSHashTableSize 2048\n  DOSPageCount 20  # maximum number of requests for the same page\n  DOSSiteCount 300  # total number of requests for any object by the same client IP on the same listener\n  DOSPageInterval 1.0 # interval for the page count threshold\n  DOSSiteInterval 1.0  # interval for the site count threshold\n  DOSBlockingPeriod 10.0 # time that a client IP will be blocked for\n  DOSLogDir “/var/log/apache2/evasive”\n  DOSEmailNotify root@localhost\n</IfModule>" > /etc/apache2/conf-available/mod-evasive.conf
+sudo echo -e "<IfModule mod_spamhaus.c>\n  DOSHashTableSize 2048\n  DOSPageCount 20\n  DOSSiteCount 300\n  DOSPageInterval 1.0\n  DOSSiteInterval 1.0\n  DOSBlockingPeriod 10.0\n  DOSLogDir “/var/log/apache2/evasive”\n  DOSEmailNotify root@localhost\n</IfModule>" > /etc/apache2/conf-available/mod-evasive.conf
 sudo a2enconf mod-evasive.conf
 
 # DNS Injection
@@ -226,7 +101,7 @@ sudo echo -e "<IfModule mod_spamhaus.c>\n  MS_METHODS POST,PUT,OPTIONS,CONNECT\n
 sudo a2enconf spamhauf.conf
 
 # enable modules
-sudo a2enmod actions fastcgi alias rewrite headers qos spamhaus evasive cache cache_disk
+sudo a2enmod actions fastcgi alias rewrite headers qos spamhaus evasive cache cache_disk ssl
 
 # phpmyadmin apache 2.4
 sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
@@ -237,7 +112,7 @@ sudo a2enconf phpmyadmin.conf
 # -----------------------------------------------------
 
 # install some gems - yes gem1.9.3 - wtf - use rbenv
-# sudo gem1.9.3 install mina bundler whenever astrails-safe
+sudo gem install bundler
 
 # install passenger
 sudo gem install passenger

data/scripts/ubuntu-14.04-dev

@@ -1,4 +1,4 @@
-# /bin/bash
+#!/bin/bash
 
 # -----------------------------------------------------
 # install native stuff
@@ -67,13 +67,13 @@ sudo echo -e "<IfModule mod_fastcgi.c>\n AddHandler php5-fcgi .php\n Action php5
 sudo a2enconf php-fpm.conf
 
 # node
-sudo ln -s /usr/bin/node /usr/bin/nodejs
+sudo ln -s /usr/bin/nodejs /usr/bin/node
 
 # Apache
 # ------
 
 # modules
-sudo a2enmod actions fastcgi alias rewrite headers
+sudo a2enmod actions fastcgi alias rewrite headers ssl
 
 # phpmyadmin apache 2.4
 sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
@@ -84,7 +84,7 @@ sudo a2enconf phpmyadmin.conf
 # -----------------------------------------------------
 
 # install some gems - yes gem1.9.3 - wtf - use rbenv
-# sudo gem1.9.3 install mina bundler whenever astrails-safe
+sudo gem install bundler
 
 # install passenger
 sudo gem install passenger

data/scripts/ubuntu.sh

@@ -1,4 +1,4 @@
-# /bin/bash
+#!/bin/bash
 
 # -----------------------------------------------------
 # install native stuff

data/skel/project_types/php/lib/Thug/Conf/Load.php

@@ -66,7 +66,8 @@ class Load {
 		$cnf = Yaml::parse($base_dir . '/config/cnf.yml');
 
 		// expected urls
-		$url = 'http://' . $cnf['apache'][APPLICATION_ENV]['server_name'];
+		$apache = empty($cnf['apache']) ? $cnf['vhost'] : $cnf['apache'];
+		$url = 'http://' . $apache[APPLICATION_ENV]['server_name'];
 
 		// load db settings
 		$db = (object) $cnf['dbs']['default'][APPLICATION_ENV];

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.88
+  version: 0.0.89
 platform: ruby
 authors:
 - azt3k
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -342,6 +342,7 @@ files:
 - scripts/mail
 - scripts/npm-bower
 - scripts/optimise-mysql
+- scripts/postgres
 - scripts/ubuntu-12.04
 - scripts/ubuntu-14.04
 - scripts/ubuntu-14.04-dev