bonethug 0.0.80 → 0.0.81

data/TODO.txt

@@ -6,4 +6,7 @@
 - thug update needs stil needs to be run twice because the current version gets loaded into memory - need to run some sort of two phase update
 - some things need to run prior to there being a deploy copy - eg. init-db
 - conf should return nil if it can't find a node
-- rbenv library support - rbenv gays out with 2.x needs readline headers manually specified
+- rbenv library support - rbenv gays out with 2.x needs readline headers manually specified
+- nagios?
+- need more modular configuration of server components for setup scripts
+- thug vhost-local and thug deploy could share more code

data/config/backup.rb

@@ -35,7 +35,7 @@ raise "No backup configuraton available" unless backup
 log_dirs.push('log') unless log_dirs.include? 'log'
 
 # back up script
-# --------------------------------  
+# --------------------------------
 
 # safe
 safe do
@@ -45,7 +45,7 @@ safe do
   local :path => "#{exec_path}/backups/:kind/:id"
 
   # use ftp to back stuff up
-  if backup.get('ftp')  
+  if backup.get('ftp')
     ftp do
       host      backup.get('ftp.host')
       user      backup.get('ftp.user')

data/config/cnf.yml

@@ -97,8 +97,10 @@ mail:
       secure: tls
       charset_encoding: utf-8
       port: 587
-apache:
+vhost:
   development:
+    conf_path: /etc/apache2/sites-available
+    type: apache
     version: 2.4
     server_name: development.domain.local
     server_aliases:
@@ -107,6 +109,8 @@ apache:
       RAILS_ENV: development
       APPLICATION_ENV: development
   staging:
+    conf_path: /etc/apache2/sites-available  
+    type: apache
     version: 2.2
     server_name: staging.domain.com
     server_aliases:
@@ -122,6 +126,8 @@ apache:
         user: username2
         pass: passw0rd2
   production:
+    conf_path: /etc/apache2/sites-available  
+    type: apache
     version: 2.4
     server_name: production.domain.com
     server_aliases:

data/config/deploy.rb

@@ -15,6 +15,7 @@
 require 'rubygems'
 require 'bonethug/conf'
 require 'bonethug/installer'
+require 'bonethug/configurator'
 # require 'mina/bundler' # does stupid stuff with symlinks
 require 'mina/rails'
 require 'mina/git'
@@ -34,6 +35,12 @@ conf.add(exec_path + '/config/database.yml' => { root: 'dbs.default' }) if File.
 # generate a hash
 cnf = conf.to_hash
 
+# check if we have a deploy config
+unless conf.get('deploy')
+  puts'could not find deployment config'
+  exit
+end
+
 # pull config from environment vars
 env = ENV['to']
 unless conf.get('deploy.environments').has_key? env
@@ -42,7 +49,7 @@ unless conf.get('deploy.environments').has_key? env
 end
 
 # build config
-deploy    = conf.node_merge('deploy.common','deploy.environments.'+env)
+deploy    = conf.node_merge 'deploy.common','deploy.environments.' + env
 resources = conf.get('resources','Array') || []
 log_dirs  = conf.get('log_dirs','Array') || []
 vendor    = conf.get('vendor','Array') || []
@@ -260,6 +267,10 @@ task :deploy => :environment do
       #{echo_cmd %[#{bundle_bin} install #{bundle_options}]}
     }
 
+    # !!!!!!
+    # COMPOSER INSTALL AND BOWER INSTALL NEEDS TO RUN HERE!!!!!!! - ASSET PRECOMPILE WILL FAIL IF DEPENDENCIES ARE NOT INCLUDED!!!!
+    # !!!!!!
+
     # rails deploy tasks
     if deploy.get('project_type') =~ /rails[0-9]?/
       invoke :'rails:db_migrate'
@@ -267,64 +278,27 @@ task :deploy => :environment do
     end
 
     # build the vhosts
-    vh_cnf = conf.get('apache.'+env)
-
-    # server aliases
-    server_aliases = ''
-    aliases = vh_cnf.get('server_aliases')
-    if aliases
-      aliases.each do |index, server_alias|
-        server_aliases += 'ServerAlias '+server_alias + "\n"
-      end
-    end
-
-    # environment variables
-    env_vars = ''
-    vars = vh_cnf.get('env_vars')
-    if vars
-      vars.each do |k, v|
-        env_vars += 'SetEnv ' + k + ' ' + v + "\n"
-      end
-    end
-
-    # server admin
-    admin = vh_cnf.get('server_admin')
-    server_admin = admin ? 'ServerAdmin '+admin : ''
-
-    vh = "
-<VirtualHost *:80>
-
-  ServerName  #{vh_cnf.get('server_name')}
-  #{server_aliases}
+    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'
 
-  #{server_admin}
+    vh = Bonethug::Configurator.vhost vh_cnf, deploy_to, true
 
-  DocumentRoot #{deploy_to}/current/public
+    case vh_cnf.get('type')
 
-  #{env_vars}
-  PassEnv PATH
+    when "nginx"
 
-  CustomLog #{deploy_to}/shared/log/bytes.log bytes
-  CustomLog #{deploy_to}/shared/log/combined.log combined
-  ErrorLog  #{deploy_to}/shared/log/error.log
+      # to be implemented
+      puts 'to be implemented'
+      exit
 
-  <Directory #{deploy_to}/current/public>
+    else # apache
 
-    Options Indexes MultiViews FollowSymLinks
-    AllowOverride All
-    Order allow,deny
-    Allow from all
-    #{vh_cnf.get('version').to_f > 2.4 ? 'Require all granted' : ''}
+      # install the vhost
+      queue! %[sudo echo "#{vh}" > #{conf_path}/#{vhost}.conf]
 
-  </Directory>
-
-</VirtualHost>
-    "
-
-    # install the vhost
-    queue! %[touch /etc/apache2/sites-available/#{vhost}.conf]
-    queue! %[rm /etc/apache2/sites-available/#{vhost}.conf]
-    queue! %[echo "#{vh}" > /etc/apache2/sites-available/#{vhost}.conf]
+    end
 
     to :launch do
 
@@ -407,6 +381,7 @@ task :deploy => :environment do
         # write to the .htpasswd file
         queue! %[touch #{deploy_to}/current/.htpasswd]
         queue! %[echo "#{htpass}" > #{deploy_to}/current/.htpasswd]
+
       else
 
         # write the to the .haccess file

data/lib/bonethug/cli.rb

@@ -1,4 +1,6 @@
 require 'rbconfig'
+require 'bonethug/conf'
+require 'bonethug/configurator'
 
 module Bonethug
   class CLI
@@ -102,6 +104,45 @@ module Bonethug
 
         end
 
+      when 'vhost-local'
+
+        # get env
+        env = ARGV.last
+
+        # exec env
+        exec_path   = File.expand_path('.')
+
+        # load config
+        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
+        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'
+
+        vh = Configurator.vhost vh_cnf, exec_path
+
+        case vh_cnf.get('type')
+
+        when "nginx"
+
+          # to be implemented
+          puts 'to be implemented'
+          exit
+
+        else # apache
+
+          # install the vhost
+          exec "echo \"#{vh}\" > #{conf_path}/#{vhost}.conf"
+
+        end  
+
       when 'init', 'update'
 
         # handle args

data/lib/bonethug/configurator.rb

@@ -0,0 +1,90 @@
+# Class for generating configurations
+
+require 'bonethug/conf'
+require 'fileutils'
+require 'find'
+require 'digest/md5'
+require 'yaml'
+require 'rbconfig'
+
+module Bonethug
+
+  class Configurator
+
+    include FileUtils
+    include Digest
+
+    def self.vhost(vh_cnf, base_path, is_remote = false)
+
+      # server aliases
+      server_aliases = ''
+      aliases = vh_cnf.get('server_aliases')
+      if aliases
+        aliases.each do |index, server_alias|
+          server_aliases += 'ServerAlias ' + server_alias + "\n"
+        end
+      end
+
+      # environment variables
+      env_vars = ''
+      vars = vh_cnf.get('env_vars')
+      if vars
+        vars.each do |k, v|
+          env_vars += 'SetEnv ' + k + ' ' + v + "\n"
+        end
+      end
+
+      # server admin
+      admin = vh_cnf.get('server_admin')
+      server_admin = admin ? 'ServerAdmin ' + admin : ''      
+
+      # paths
+      shared_path = is_remote ? '/shared' : ''
+      current_path = is_remote ? '/current' : ''
+
+      case vh_cnf.get('type')
+
+      when "nginx"
+
+        vh = ""
+
+      else # apache
+    
+        vh = "
+          <VirtualHost *:80>
+
+            ServerName  #{vh_cnf.get('server_name')}
+            #{server_aliases}
+
+            #{server_admin}
+
+            DocumentRoot #{base_path + current_path}/public
+
+            #{env_vars}
+            PassEnv PATH
+
+            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>
+
+              Options Indexes MultiViews FollowSymLinks
+              AllowOverride All
+              Order allow,deny
+              Allow from all
+              #{vh_cnf.get('version').to_f > 2.4 ? 'Require all granted' : ''}
+
+            </Directory>
+
+          </VirtualHost>
+        "
+      end
+
+      vh
+
+    end
+
+  end
+
+end

data/lib/bonethug/syncer.rb

@@ -77,9 +77,9 @@ module Bonethug
         db_local  = db.get env_local
 
         if push == 'local' and pull == 'remote'
-          cmd = "#{remote_ssh} \"mysqldump -u #{db_remote.get 'user'} -p#{db_remote.get 'pass'} #{db_remote.get 'name'} --verbose | bzip2 -c\" | bunzip2 -c | mysql -u #{db_local.get 'user'} -p#{db_local.get 'pass'} #{db_local.get 'name'}"
+          cmd = "#{remote_ssh} \"mysqldump -u #{db_remote.get 'user'} -p#{db_remote.get 'pass'} #{db_remote.get 'name'} --verbose --single-transaction -CceKq | bzip2 -c\" | bunzip2 -c | mysql -u #{db_local.get 'user'} -p#{db_local.get 'pass'} #{db_local.get 'name'}"
         elsif pull == 'local' and push == 'remote'
-          cmd = "mysqldump -u #{db_local.get 'user'} -p#{db_local.get 'pass'} #{db_local.get 'name'} --verbose | bzip2 -c | #{remote_ssh} \"bunzip2 -c | mysql -u #{db_remote.get 'user'} -p#{db_remote.get 'pass'} #{db_remote.get 'name'}\""
+          cmd = "mysqldump -u #{db_local.get 'user'} -p#{db_local.get 'pass'} #{db_local.get 'name'} --verbose --single-transaction -CceKq | bzip2 -c | #{remote_ssh} \"bunzip2 -c | mysql -u #{db_remote.get 'user'} -p#{db_remote.get 'pass'} #{db_remote.get 'name'}\""
         end
 
         puts cmd

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.80"
-          BUILD_DATE = "2014-05-06 10:37:06 +1200"
+          VERSION = "0.0.81"
+          BUILD_DATE = "2014-06-02 10:38:16 +1200"
         end
       

data/scripts/ubuntu_setup_2.4.sh

@@ -13,6 +13,7 @@ sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)
 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
@@ -65,7 +66,7 @@ sed -i -e "s/listen = \/var\/run\/php5-fpm.sock/listen = 127.0.0.1:9000/g" /etc/
 
 #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
-a2enconf php-fpm.conf
+sudo a2enconf php-fpm.conf
 
 # Apache
 # ------

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

@@ -59,7 +59,7 @@ class Load {
 		self::set_constants();
 
 		// paths
-		$base_dir = realpath(__DIR__ . '/..');
+		$base_dir = realpath(__DIR__ . '/../../..');
 		$public_dir = realpath($base_dir . '/public');
 
 		// load conf

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.81
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -389,6 +389,7 @@ files:
 - lib/bonethug.rb
 - lib/bonethug/cli.rb
 - lib/bonethug/conf.rb
+- lib/bonethug/configurator.rb
 - lib/bonethug/installer.rb
 - lib/bonethug/syncer.rb
 - lib/bonethug/utils.rb
@@ -557,21 +558,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1758899776465409101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1758899776465409101
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Bonethug