bonethug 0.0.82 → 0.0.83

data/bin/bonethug

@@ -5,4 +5,38 @@ root_path = File.expand_path(File.dirname(__FILE__)) + '/..'
 require 'rubygems' unless Object.const_defined?(:Gem)
 require root_path +'/lib/bonethug'
 
+#-----------------------------------
+# require 'io/console'
+
+# list = Bonethug::CLI.tasks.sort
+
+# word = ""
+
+# while (char = $stdin.getch) != "\r"
+#    word += char
+#    word = "" if char == " "
+#    if char == "\t"
+#    	  list.each do |task|
+#       	print task if task[0..word.length-1] == word
+#       end
+#    else
+#       print char
+#    end
+# end
+# puts
+
+#-----------------------------------
+# require 'readline'
+
+# list = Bonethug::CLI.tasks.sort
+
+# comp = proc { |s| list.grep(/^#{Regexp.escape(s)}/) }
+
+# Readline.completion_append_character = " "
+# Readline.completion_proc = comp
+
+# while line = Readline.readline('> ', true)
+#   p line
+# end
+
 Bonethug::CLI.handle 'bonethug'

data/bin/thug

@@ -5,4 +5,38 @@ root_path = File.expand_path(File.dirname(__FILE__)) + '/..'
 require 'rubygems' unless Object.const_defined?(:Gem)
 require root_path +'/lib/bonethug'
 
+#-----------------------------------
+# require 'io/console'
+
+# list = Bonethug::CLI.tasks.sort
+
+# word = ""
+
+# while (char = $stdin.getch) != "\r"
+#    word += char
+#    word = "" if char == " "
+#    if char == "\t"
+#    	  list.each do |task|
+#       	print task if task[0..word.length-1] == word
+#       end
+#    else
+#       print char
+#    end
+# end
+# puts
+
+#-----------------------------------
+# require 'readline'
+
+# list = Bonethug::CLI.tasks.sort
+
+# comp = proc { |s| list.grep(/^#{Regexp.escape(s)}/) }
+
+# Readline.completion_append_character = " "
+# Readline.completion_proc = comp
+
+# while line = Readline.readline('> ', true)
+#   p line
+# end
+
 Bonethug::CLI.handle 'thug'

data/config/deploy.rb

@@ -414,8 +414,10 @@ task :deploy => :environment do
       cmds = conf.get 'post_cmds'
       if cmds
         cmds = cmds.get env
-        cmds.each do |index, cmd|
-          queue cmd
+        if cmds
+          cmds.each do |index, cmd|
+            queue cmd
+          end
         end
       end
 

data/lib/bonethug/cli.rb

@@ -5,6 +5,39 @@ require 'bonethug/configurator'
 module Bonethug
   class CLI
 
+    @@tasks = [
+      'help',
+      'auth',
+      'install',
+      'init-db',
+      'init-local-db',
+      'setup-db',
+      'setup-env',
+      'vhost-local',
+      'init',
+      'update',
+      'run',
+      'rake',
+      'drush',
+      'drush-local',
+      'sake',
+      'sync-state',
+      'deploy',
+      'setup',
+      'remote-backup',
+      'local-backup',
+      'sync-backup-to',
+      'sync-backup-from',
+      'force-unlock',
+      'cleanup',
+      'clean',
+      'watch'    
+    ]
+
+    def self.tasks
+      @@tasks
+    end
+
     def self.handle(bin_name = 'thug')
 
       # what are we doing?
@@ -56,7 +89,7 @@ module Bonethug
         admin_user = ARGV.length == 3 ? ARGV[1] : 'root'
 
         # validate
-        unless env
+        if !env || env == task
           puts 'Usage: ' + bin_name + ' ' + task + ' [admin_user] [environment]'
           return
         end
@@ -75,7 +108,7 @@ module Bonethug
         env = ARGV.last
 
         # validate
-        unless env
+        if !env || env == task
           puts 'Usage: ' + bin_name + ' setup-env [environment]'
           return
         end
@@ -108,28 +141,30 @@ module Bonethug
 
         # get env
         env = ARGV.last
+        env = 'development' if env == 'vhost-local'
 
         # exec env
         exec_path   = File.expand_path('.')
 
         # load config
-        conf = Conf.new.add(exec_path + '/config/cnf.yml')
+        conf = Conf.new.add exec_path + '/config/cnf.yml'
         conf.add(exec_path + '/config/database.yml' => { root: 'dbs.default' }) if File.exist? exec_path + '/config/database.yml'        
         deploy = conf.node_merge 'deploy.common', 'deploy.environments.' + env
 
         # vhost name
         vhost = deploy.get('project_slug') + '_' + env
 
-        # build the vhosts
+        # build the vhost conf
         vh_cnf = conf.get 'vhost'
         vh_cnf = conf.get 'apache' unless vh_cnf
         vh_cnf = vh_cnf.get env
         conf_path = vh_cnf.get('conf_path') || '/etc/apache2/sites-available'
 
+        # load the appropriate config for the web server
         vh = Configurator.vhost vh_cnf, exec_path
 
+        # check if we have a custom config for the webserver type
         case vh_cnf.get('type')
-
         when "nginx"
 
           # to be implemented
@@ -152,14 +187,19 @@ module Bonethug
         "
 
         # write the to the hosts file
-        system "sed -i '/## BONETHUG-#{vhost} ##/,/## END_BONETHUG-#{vhost} ##/ s/.*//g' #{path}" 
+        # this needs work
+        system "sed -i '/## BONETHUG-#{vhost} ##/,/## END_BONETHUG-#{vhost} ##/ s/.*//g' #{path}"
         escaped = (hosts).gsub(/"/, '\"')
         system "echo \"#{escaped}\" >> #{path}"
 
+        # reload apache - linux - but need a debian specific look up
+        system "a2ensite #{vhost} && service apache2 restart" if RbConfig::CONFIG['target_os'] =~ /linux/i
+
       when 'init', 'update'
 
         # handle args
         location = ARGV[1] || '.'
+        stage = ARGV[2] || 0
 
         # validate
         unless location
@@ -168,7 +208,7 @@ module Bonethug
         end
 
         # run the initaliser
-        Installer.bonethugise(location, task.to_sym)
+        Installer.bonethugise location, task.to_sym, stage.to_i
 
       when  'run',
             'rake',

data/lib/bonethug/configurator.rb

@@ -61,6 +61,8 @@ module Bonethug
 
       else # apache
     
+        access = vh_cnf.get('version').to_f >= 2.4 ? "Require all granted" : "Order allow,deny\nAllow from all"
+
         vh = "
           <VirtualHost *:80>
 
@@ -82,9 +84,7 @@ module Bonethug
 
               Options Indexes MultiViews FollowSymLinks
               AllowOverride All
-              Order allow,deny
-              Allow from all
-              #{vh_cnf.get('version').to_f > 2.4 ? 'Require all granted' : ''}
+              #{access}
 
             </Directory>
 

data/lib/bonethug/installer.rb

@@ -155,8 +155,13 @@ module Bonethug
       conf.get('dbs').each do |name,envs|
 
         db = envs.get env
-        puts "creating: " + db.get('name')
-        system Bonethug::Installer.init_mysql_db_script(db, path, admin_user)
+        if !db
+          puts "No db for env " + env + " found - check your config file"
+          exit
+        else
+          puts "Mysql user " + admin_user + " is creating db: " + db.get('name') + " and granting access to " + db.get('user') + "@" + db.get('host')
+          system Bonethug::Installer.init_mysql_db_script(db, path, admin_user)
+        end
 
       end
 
@@ -245,129 +250,146 @@ module Bonethug
     # add bonethug to gemfile if required
     # run bundle install
 
-    def self.bonethugise(dir='.', mode=:init)
+    def self.bonethugise(dir='.', mode=:init, stage=0)
 
       target = File.expand_path(dir)
 
-      # run bundle update first
-      system('bundle update bonethug') if mode == :update
+      case stage
+      when 0
 
-      # check for the existence of required dirs and create if required
-      [target + '/.bonethug', target + '/config', target + '/config/example'].each do |path|
-        FileUtils.mkdir path unless File.directory? path
-      end
+        # get bonethug
+        if mode == :update
+          system 'bundle update bonethug'
+        else
+          system 'bundle install bonethug'
+        end
 
-      # insert version file
-      File.open(target + '/.bonethug/version','w') { |file| file.puts VERSION }
+        # kill this process and run the next step as a new process
+        exec 'bundle exec thug ' + mode.to_s + ' ' + dir + ' ' + (stage + 1).to_s
 
-      # Handle config files
-      @@project_config_files.each do |type, dirs|
-        dirs.each do |config|
+      when 1
 
-          # vars
-          src_file      = @@bonthug_gem_dir + '/config/' + config
-          example_file  = target + '/config/example/' + config if type == :editable
-          target_file   = type == :editable ? target + '/config/' + config : target + '/.bonethug/' + config
+        # check for the existence of required dirs and create if required
+        [target + '/.bonethug', target + '/config', target + '/config/example'].each do |path|
+          FileUtils.mkdir path unless File.directory? path
+        end
 
-          # output
-          puts 'Handling ' + target_file
+        # insert version file
+        File.open(target + '/.bonethug/version','w') { |file| file.puts VERSION }
+
+        # Handle config files
+        @@project_config_files.each do |type, dirs|
+          dirs.each do |config|
+
+            # vars
+            src_file      = @@bonthug_gem_dir + '/config/' + config
+            example_file  = target + '/config/example/' + config if type == :editable
+            target_file   = type == :editable ? target + '/config/' + config : target + '/.bonethug/' + config
+
+            # output
+            puts 'Handling ' + target_file
+
+            # what mode are we in?
+            if mode == :init
+              FileUtils.cp src_file, example_file if type == :editable and !File.exist?(example_file)
+              FileUtils.cp src_file, target_file unless File.exist?(target_file)
+            elsif mode == :update
+              FileUtils.cp src_file, example_file if type == :editable
+              FileUtils.cp src_file, target_file if type == :generated or !File.exist?(target_file)
+            else
+              puts "Invalid bonethugise mode"
+              exit
+            end
 
-          # what mode are we in?
-          if mode == :init
-            FileUtils.cp src_file, example_file if type == :editable and !File.exist?(example_file)
-            FileUtils.cp src_file, target_file unless File.exist?(target_file)
-          elsif mode == :update
-            FileUtils.cp src_file, example_file if type == :editable
-            FileUtils.cp src_file, target_file if type == :generated or !File.exist?(target_file)
-          else
-            puts "Invalid bonethugise mode"
-            exit
           end
-
         end
-      end
-
-      # Handle project type specific files
-      if mode == :update
-        target_cnf = target + '/config/cnf.yml'
-        project_conf = Conf.new.add target_cnf
-        project_type = project_conf.get('deploy.common.project_type')
-        if project_type
-          bonethug_files = @@conf.get 'project_types.' + project_type + '.bonethug_files'
-          if bonethug_files
-            bonethug_files.each do |index, file|
-
-              # push some output
-              puts 'Handling ' + index.to_s + ':' + file.to_s
 
-              # do the copy
-              src_file =  @@bonthug_gem_dir + '/skel/project_types/' + project_type + '/' + file
-              dst_file = target + '/' + file
-              FileUtils.cp src_file, dst_file
+        # Handle project type specific files
+        if mode == :update
+          target_cnf = target + '/config/cnf.yml'
+          project_conf = Conf.new.add target_cnf
+          project_type = project_conf.get('deploy.common.project_type')
+          if project_type
+            bonethug_files = @@conf.get 'project_types.' + project_type + '.bonethug_files'
+            if bonethug_files
+              bonethug_files.each do |index, file|
+
+                # push some output
+                puts 'Handling ' + index.to_s + ':' + file.to_s
+
+                # do the copy
+                src_file =  @@bonthug_gem_dir + '/skel/project_types/' + project_type + '/' + file
+                dst_file = target + '/' + file
+                dir = File.dirname dst_file
+                FileUtils.mkdir_p dir
+                FileUtils.cp_r src_file, dst_file
 
+              end
             end
+          else
+            puts "Couldn't find project type in " + target_cnf
           end
-        else
-          puts "Couldn't find project type in " + target_cnf
         end
-      end
 
-      # handle gemfile
-      gemfile_path = target + '/Gemfile'
-      if File.exist? gemfile_path
-
-        # extract the contents
-        gemfile_contents = File.read(gemfile_path)
-
-        # identify what we are looking for
-        required_gems = {
-          'mina'              => 'nadarei/mina',
-          'astrails-safe'     => 'astrails/safe',
-          'whenever'          => 'javan/whenever',
-          'guard-erb'         => 'azt3k/guard-erb',
-          'coffee-script'     => 'josh/ruby-coffee-script',
-          'guard-uglify'      => 'customink/guard-uglify',
-          'guard-concat'      => 'mikz/guard-concat',
-          'bonethug'          => nil
-        }
-
-        # look at each requirement and identify if we need things
-        required_gems.each do |gem_name, github|
-
-          add_gem = false;
-          gem_reg = Regexp.new('gem[^"\']+["\']'+gem_name+'["\']')
-          git_reg = Regexp.new('gem[^"\']+["\']'+gem_name+'["\'],[^,]+github: ["\']'+github+'["\']') if github
-
-          if gem_reg =~ gemfile_contents
-            puts 'Found '+gem_name+' in gem file.'
-            if github
-              puts 'Requires github version, checking...'
-              unless git_reg =~ gemfile_contents
-                puts 'Couldn\'t find '+gem_name+' (github) in gem file adding...'
-                gemfile_contents.gsub(gem_reg,'')
-                add_gem = true;
+        # handle gemfile
+        gemfile_path = target + '/Gemfile'
+        if File.exist? gemfile_path
+
+          # extract the contents
+          gemfile_contents = File.read(gemfile_path)
+
+          # identify what we are looking for
+          # this should have groups - i.e. dev
+          required_gems = {
+            'mina'              => 'nadarei/mina',
+            'astrails-safe'     => 'astrails/safe',
+            'whenever'          => 'javan/whenever',
+            'guard-erb'         => 'azt3k/guard-erb',
+            'coffee-script'     => 'josh/ruby-coffee-script',
+            'guard-uglify'      => 'customink/guard-uglify',
+            'guard-concat'      => 'mikz/guard-concat',
+            'bonethug'          => nil
+          }
+
+          # look at each requirement and identify if we need things
+          required_gems.each do |gem_name, github|
+
+            add_gem = false;
+            gem_reg = Regexp.new('gem[^"\']+["\']'+gem_name+'["\']')
+            git_reg = Regexp.new('gem[^"\']+["\']'+gem_name+'["\'],[^,]+github: ["\']'+github+'["\']') if github
+
+            if gem_reg =~ gemfile_contents
+              puts 'Found '+gem_name+' in gem file.'
+              if github
+                puts 'Requires github version, checking...'
+                unless git_reg =~ gemfile_contents
+                  puts 'Couldn\'t find '+gem_name+' (github) in gem file adding...'
+                  gemfile_contents.gsub(gem_reg,'')
+                  add_gem = true;
+                end
               end
+            else
+              puts "Couldn't find "+gem_name+" in gem file adding..."
+              add_gem = true;
+            end
+
+            if add_gem
+              gemfile_contents += "\n" + 'gem "'+gem_name+'"'+(github ? ', github: "'+github+'"' : '') 
+              File.open(gemfile_path,'w') { |file| file.puts gemfile_contents }
             end
-          else
-            puts "Couldn't find "+gem_name+" in gem file adding..."
-            add_gem = true;
-          end
 
-          if add_gem
-            gemfile_contents += "\n" + 'gem "'+gem_name+'"'+(github ? ', github: "'+github+'"' : '') 
-            File.open(gemfile_path,'w') { |file| file.puts gemfile_contents }
           end
 
+        else
+          puts 'No Gemfile found, creating one...'
+          FileUtils.cp @@skel_dir + '/base/Gemfile', gemfile_path
         end
 
-      else
-        puts 'No Gemfile found, creating one...'
-        FileUtils.cp @@skel_dir + '/base/Gemfile', gemfile_path
+        # run bundler
+        exec 'bundle install --path vendor'
+      
       end
 
-      # run bundler
-      exec 'bundle install --path vendor'
-
       # self
 
     end

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.82"
-          BUILD_DATE = "2014-06-02 12:27:14 +1200"
+          VERSION = "0.0.83"
+          BUILD_DATE = "2014-06-14 11:26:12 +1200"
         end
       

data/scripts/mail

@@ -0,0 +1,6 @@
+# /bin/bash
+
+cd /usr/share && sudo git clone https://github.com/joshdata/mailinabox
+sudo bash mailinabox/setup/start.sh
+
+# need to go in and change the default listening ports in /etc/nginx/conf.d/local.conf

data/scripts/ubuntu-14.04-dev.sh

@@ -0,0 +1,138 @@
+# /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 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
+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 curl libapache2-mod-fastcgi 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 ruby1.9.3 wkhtmltopdf nodejs npm
+
+
+# -----------------------------------------------------
+# 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
+
+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
+# 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 </IfModule>" > /etc/apache2/conf.d/php-fpm.conf
+
+#apache2.4
+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
+
+# Apache
+# ------
+
+# modules
+sudo a2enmod actions fastcgi alias rewrite headers
+
+# 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 gem1.9.3 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
+
+# -----------------------------------------------------
+# Build tools
+# -----------------------------------------------------
+
+sudo apt-get install pngcrush jpegoptim pngquant libcroco3*
+
+# -----------------------------------------------------
+# things bashit likes
+# -----------------------------------------------------
+
+sudo apt-get install irssi irissi-scripts
+
+# -----------------------------------------------------
+# rbenv
+# -----------------------------------------------------
+
+git clone https://github.com/sstephenson/rbenv.git ~/.rbenv
+echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
+echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
+
+# -----------------------------------------------------
+# Bash it
+# -----------------------------------------------------
+
+sudo apt-get install python-pip python-dev-all
+sudo pip install argcomplete
+sudo activate-global-python-argcomplete
+git clone https://github.com/revans/bash-it.git ~/.bash_it
+~/.bash_it/install.sh
+echo -e "BASH_IT=$HOME/.bash_it\nexport BASH_IT_THEME='bobby'\nexport GIT_HOSTING='git@github.com'\nexport EDITOR=\"/usr/bin/subl -w\"\nexport GIT_EDITOR='/usr/bin/subl -w'\nexport TODO=\"t\"\nexport IRC_CLIENT='irssi'\nsource $BASH_IT/bash_it.sh" >> ~/.bashrc

data/scripts/ubuntu_setup.sh

@@ -60,12 +60,12 @@ sudo apt-get install git ruby1.9.3 nodejs npm
 # " > /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
 
-sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
+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
 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 -appConnTimeout 900 -idle-timeout 900 -pass-header Authorization\n </IfModule>" > /etc/apache2/conf.d/php-fpm.conf
 
 #apache2.4
 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 -appConnTimeout 900 -idle-timeout 900 -pass-header Authorization\n <Directory />\nRequire all granted\n </Directory>\n </IfModule>" > /etc/apache2/conf-available/php-fpm.conf
-a2enconf php-fpm.conf
+sudo a2enconf php-fpm.conf
 
 # Apache
 # ------
@@ -93,7 +93,7 @@ sudo touch /etc/apache2/mods-available/passenger.conf
 # Node.js related
 # -----------------------------------------------------
 
-npm install bower -g
+sudo npm install bower -g
 
 # -----------------------------------------------------
 # Restart stuff

data/scripts/ubuntu_setup_2.4.sh

@@ -61,13 +61,16 @@ sudo apt-get install git ruby1.9.3 wkhtmltopdf nodejs npm
 # " > /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
 
-sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g" /etc/php5/fpm/pool.d/www.conf
+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
 # 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 </IfModule>" > /etc/apache2/conf.d/php-fpm.conf
 
 #apache2.4
 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
 
+# symlink node to nodejs
+sudo ln -s /usr/bin/nodejs /usr/bin/node
+
 # Apache
 # ------
 
@@ -75,8 +78,8 @@ sudo a2enconf php-fpm.conf
 sudo a2enmod actions fastcgi alias rewrite headers
 
 # phpmyadmin apache 2.4
-cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
-a2enconf phpmyadmin.conf
+sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
+sudo a2enconf phpmyadmin.conf
 
 # -----------------------------------------------------
 # Install Gems
@@ -96,7 +99,7 @@ sudo touch /etc/apache2/mods-available/passenger.conf
 # Node.js related
 # -----------------------------------------------------
 
-npm install bower -g
+sudo npm install bower -g
 
 # -----------------------------------------------------
 # Restart stuff

data/skel/project_types/silverstripe3/lib/ss_loadconf.php

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.82
+  version: 0.0.83
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -397,6 +397,8 @@ files:
 - lib/bonethug/watcher.rb
 - lib/init.rb
 - lib/tasks/bonethug.rake
+- scripts/mail
+- scripts/ubuntu-14.04-dev.sh
 - scripts/ubuntu_setup.sh
 - scripts/ubuntu_setup_2.4.sh
 - skel/base/.gitignore