bonethug 0.0.90 → 0.0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77465f9d1f7dcb7689e30cc85424e067c18ad1be
-  data.tar.gz: 9656c1ec690b082490a5644e25b3ed627b0c9c02
+  metadata.gz: e3b5acbf855f01f777e57da607b6d8417186dfe0
+  data.tar.gz: eaea090bf11ea3fa7fcd26cb1564b65339b1aa49
 SHA512:
-  metadata.gz: fef8f05c7fddd713500edd19d956b775466d67d45b99d6378ff9aa21e016cbb94f4dada4de129a40299a0eaaf97535549aff3770ae090c7b391f87d703100a9c
-  data.tar.gz: 847f44b43896b22a6bca0e9173c9503d3662e5ade9844722c62291d0cd01c92cc7feb1fc633740b405a903bede568b4a6a056785b42c82a067aa626194e40bf9
+  metadata.gz: d33db482c219fa8897f50e330f81fcc6fac5a1d23eff531645aa4196bcb0176cb1f999ce466c1f63373dedcd3710ead7f5abd1af2889fb156a8427416b0e95db
+  data.tar.gz: 671fc724b55a8bddd7198e563849d6d4b38860eadfa09b40fbe7bd6aea462528a0162ee014e426621babc2c60c1ba4f8e5659bcd27dd658168510d3576922209

data/config/cnf.yml

@@ -141,10 +141,28 @@ vhost:
     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_name: production.domain.com2
     server_aliases:
       - www.production.domain.com
     server_admin: dev@domain.com
+    custom:
+      - ExpiresActive On
+      - 'ExpiresByType image/jpg "access plus 1 year"'
+      - 'ExpiresByType image/jpeg "access plus 1 year"'
+      - 'ExpiresByType image/gif "access plus 1 year"'
+      - 'ExpiresByType image/png "access plus 1 year"'
+      - 'ExpiresByType text/css "access plus 1 month"'
+      - 'ExpiresByType application/pdf "access plus 1 month"'
+      - 'ExpiresByType text/x-javascript "access plus 1 month"'
+      - 'ExpiresByType application/x-shockwave-flash "access plus 1 month"'
+      - 'ExpiresByType image/x-icon "access plus 1 year"'
+      - 'ExpiresByType text/css "access 15 days"'
+      - 'ExpiresByType application/javascript "access plus 15 days"'
+      - 'ExpiresDefault "access plus 2 days"'
+      - CacheRoot /tmp/http_cache
+      - CacheEnable disk /
+      - CacheDirLevels 5
+      - CacheDirLength 3
     env_vars:
       RAILS_ENV: production
       APPLICATION_ENV: production

data/config/deploy.rb

@@ -295,7 +295,7 @@ task :deploy => :environment do
     vh_cnf = vh_cnf.get env
     conf_path = vh_cnf.get('conf_path') || '/etc/apache2/sites-available'
 
-    vh = Bonethug::Configurator.vhost vh_cnf, deploy_to, deploy.get('project_type'), env, true
+    vh = Bonethug::Configurator.vhost(vh_cnf, deploy_to, deploy.get('project_type'), env, true).gsub('"','\"')
 
     case vh_cnf.get('type')
 
@@ -360,7 +360,7 @@ task :deploy => :environment do
       queue! %[php #{deploy_to}/shared/composer.phar install] if use_composer
 
       # update bower
-      queue! %[cd #{deploy_to}/current && bower install --allow-root] if use_bower
+      queue! %[cd #{deploy_to}/current && bower install --allow-root && bower update --allow-root] if use_bower
 
       # trigger a restart on rack based systems
       queue! %[touch #{deploy_to}/current/tmp/restart.txt]

data/lib/bonethug/configurator.rb

@@ -44,7 +44,7 @@ module Bonethug
 
       # environment variables
       env_vars = 'SetEnv ' + conf.get('env_var') + ' ' + env + "\n"
-      vars = vh_cnf.get('env_vars')
+      vars = vh_cnf.get 'env_vars'
       if vars
         vars.each do |k, v|
           env_vars += 'SetEnv ' + k + ' ' + v + "\n"
@@ -67,6 +67,14 @@ module Bonethug
       ssl_crt = vh_cnf.get 'ssl_crt'
       ssl_crt = base_path + current_path + '/' + ssl_crt if ssl_crt and ssl_crt[0...0] != '/'
 
+      custom = vh_cnf.get 'custom'
+      custom_str = ''
+      if custom
+        custom.each do |k, v|
+          custom_str += v + "\n"
+        end
+      end
+
       # 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] != '/'
@@ -95,6 +103,8 @@ module Bonethug
             #{env_vars}
             PassEnv PATH
 
+            #{custom_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
@@ -130,6 +140,8 @@ module Bonethug
               SSLCertificateKeyFile #{ssl_key}
               #{ca_str}
 
+              #{custom_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

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.90"
-          BUILD_DATE = "2014-10-22 15:40:01 +1300"
+          VERSION = "0.0.91"
+          BUILD_DATE = "2014-11-09 12:05:23 +1300"
         end
       

data/scripts/ubuntu-12.04

@@ -97,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 ssl
+sudo a2enmod actions fastcgi alias rewrite expires headers qos spamhaus evasive cache cache_disk ssl
 
 # phpmyadmin apache 2.4
 sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf

data/scripts/ubuntu-14.04

@@ -101,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 ssl
+sudo a2enmod actions fastcgi alias rewrite expires headers qos spamhaus evasive cache cache_disk ssl
 
 # phpmyadmin apache 2.4
 sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
@@ -131,4 +131,4 @@ sudo npm install bower -g
 # -----------------------------------------------------
 
 sudo service apache2 restart
-sudo service php5-fpm restart
+sudo service php5-fpm restart

data/scripts/ubuntu.sh

@@ -67,7 +67,7 @@ sudo echo -e "<IfModule mod_fastcgi.c>\n AddHandler php5-fcgi .php\n Action php5
 # ------
 
 # modules
-sudo a2enmod actions fastcgi alias rewrite headers
+sudo a2enmod actions fastcgi alias expires rewrite headers
 
 # phpmyadmin
 sudo ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.90
+  version: 0.0.91
 platform: ruby
 authors:
 - azt3k
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler