bonethug 0.0.90 → 0.0.91
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/cnf.yml +19 -1
- data/config/deploy.rb +2 -2
- data/lib/bonethug/configurator.rb +13 -1
- data/lib/bonethug/version.rb +2 -2
- data/scripts/ubuntu-12.04 +1 -1
- data/scripts/ubuntu-14.04 +2 -2
- data/scripts/ubuntu.sh +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e3b5acbf855f01f777e57da607b6d8417186dfe0
|
4
|
+
data.tar.gz: eaea090bf11ea3fa7fcd26cb1564b65339b1aa49
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d33db482c219fa8897f50e330f81fcc6fac5a1d23eff531645aa4196bcb0176cb1f999ce466c1f63373dedcd3710ead7f5abd1af2889fb156a8427416b0e95db
|
7
|
+
data.tar.gz: 671fc724b55a8bddd7198e563849d6d4b38860eadfa09b40fbe7bd6aea462528a0162ee014e426621babc2c60c1ba4f8e5659bcd27dd658168510d3576922209
|
data/config/cnf.yml
CHANGED
@@ -141,10 +141,28 @@ vhost:
|
|
141
141
|
ssl_key: /etc/ssl/private/ssl-cert-snakeoil.key
|
142
142
|
ssl_crt: /etc/ssl/certs/ssl-cert-snakeoil.pem
|
143
143
|
ssl_ca_bundle:
|
144
|
-
server_name: production.domain.
|
144
|
+
server_name: production.domain.com2
|
145
145
|
server_aliases:
|
146
146
|
- www.production.domain.com
|
147
147
|
server_admin: dev@domain.com
|
148
|
+
custom:
|
149
|
+
- ExpiresActive On
|
150
|
+
- 'ExpiresByType image/jpg "access plus 1 year"'
|
151
|
+
- 'ExpiresByType image/jpeg "access plus 1 year"'
|
152
|
+
- 'ExpiresByType image/gif "access plus 1 year"'
|
153
|
+
- 'ExpiresByType image/png "access plus 1 year"'
|
154
|
+
- 'ExpiresByType text/css "access plus 1 month"'
|
155
|
+
- 'ExpiresByType application/pdf "access plus 1 month"'
|
156
|
+
- 'ExpiresByType text/x-javascript "access plus 1 month"'
|
157
|
+
- 'ExpiresByType application/x-shockwave-flash "access plus 1 month"'
|
158
|
+
- 'ExpiresByType image/x-icon "access plus 1 year"'
|
159
|
+
- 'ExpiresByType text/css "access 15 days"'
|
160
|
+
- 'ExpiresByType application/javascript "access plus 15 days"'
|
161
|
+
- 'ExpiresDefault "access plus 2 days"'
|
162
|
+
- CacheRoot /tmp/http_cache
|
163
|
+
- CacheEnable disk /
|
164
|
+
- CacheDirLevels 5
|
165
|
+
- CacheDirLength 3
|
148
166
|
env_vars:
|
149
167
|
RAILS_ENV: production
|
150
168
|
APPLICATION_ENV: production
|
data/config/deploy.rb
CHANGED
@@ -295,7 +295,7 @@ task :deploy => :environment do
|
|
295
295
|
vh_cnf = vh_cnf.get env
|
296
296
|
conf_path = vh_cnf.get('conf_path') || '/etc/apache2/sites-available'
|
297
297
|
|
298
|
-
vh = Bonethug::Configurator.vhost
|
298
|
+
vh = Bonethug::Configurator.vhost(vh_cnf, deploy_to, deploy.get('project_type'), env, true).gsub('"','\"')
|
299
299
|
|
300
300
|
case vh_cnf.get('type')
|
301
301
|
|
@@ -360,7 +360,7 @@ task :deploy => :environment do
|
|
360
360
|
queue! %[php #{deploy_to}/shared/composer.phar install] if use_composer
|
361
361
|
|
362
362
|
# update bower
|
363
|
-
queue! %[cd #{deploy_to}/current && bower install --allow-root] if use_bower
|
363
|
+
queue! %[cd #{deploy_to}/current && bower install --allow-root && bower update --allow-root] if use_bower
|
364
364
|
|
365
365
|
# trigger a restart on rack based systems
|
366
366
|
queue! %[touch #{deploy_to}/current/tmp/restart.txt]
|
@@ -44,7 +44,7 @@ module Bonethug
|
|
44
44
|
|
45
45
|
# environment variables
|
46
46
|
env_vars = 'SetEnv ' + conf.get('env_var') + ' ' + env + "\n"
|
47
|
-
vars = vh_cnf.get
|
47
|
+
vars = vh_cnf.get 'env_vars'
|
48
48
|
if vars
|
49
49
|
vars.each do |k, v|
|
50
50
|
env_vars += 'SetEnv ' + k + ' ' + v + "\n"
|
@@ -67,6 +67,14 @@ module Bonethug
|
|
67
67
|
ssl_crt = vh_cnf.get 'ssl_crt'
|
68
68
|
ssl_crt = base_path + current_path + '/' + ssl_crt if ssl_crt and ssl_crt[0...0] != '/'
|
69
69
|
|
70
|
+
custom = vh_cnf.get 'custom'
|
71
|
+
custom_str = ''
|
72
|
+
if custom
|
73
|
+
custom.each do |k, v|
|
74
|
+
custom_str += v + "\n"
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
70
78
|
# ssl crt
|
71
79
|
ssl_ca_bundle = vh_cnf.get 'ssl_ca_bundle'
|
72
80
|
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
|
|
95
103
|
#{env_vars}
|
96
104
|
PassEnv PATH
|
97
105
|
|
106
|
+
#{custom_str}
|
107
|
+
|
98
108
|
CustomLog #{base_path + shared_path}/log/bytes.log bytes
|
99
109
|
CustomLog #{base_path + shared_path}/log/combined.log combined
|
100
110
|
ErrorLog #{base_path + shared_path}/log/error.log
|
@@ -130,6 +140,8 @@ module Bonethug
|
|
130
140
|
SSLCertificateKeyFile #{ssl_key}
|
131
141
|
#{ca_str}
|
132
142
|
|
143
|
+
#{custom_str}
|
144
|
+
|
133
145
|
CustomLog #{base_path + shared_path}/log/bytes.log bytes
|
134
146
|
CustomLog #{base_path + shared_path}/log/combined.log combined
|
135
147
|
ErrorLog #{base_path + shared_path}/log/error.log
|
data/lib/bonethug/version.rb
CHANGED
data/scripts/ubuntu-12.04
CHANGED
@@ -97,7 +97,7 @@ sudo echo -e "<IfModule mod_spamhaus.c>\n MS_METHODS POST,PUT,OPTIONS,CONNECT\n
|
|
97
97
|
sudo a2enconf spamhauf.conf
|
98
98
|
|
99
99
|
# enable modules
|
100
|
-
sudo a2enmod actions fastcgi alias rewrite headers qos spamhaus evasive cache cache_disk ssl
|
100
|
+
sudo a2enmod actions fastcgi alias rewrite expires headers qos spamhaus evasive cache cache_disk ssl
|
101
101
|
|
102
102
|
# phpmyadmin apache 2.4
|
103
103
|
sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
|
data/scripts/ubuntu-14.04
CHANGED
@@ -101,7 +101,7 @@ sudo echo -e "<IfModule mod_spamhaus.c>\n MS_METHODS POST,PUT,OPTIONS,CONNECT\n
|
|
101
101
|
sudo a2enconf spamhauf.conf
|
102
102
|
|
103
103
|
# enable modules
|
104
|
-
sudo a2enmod actions fastcgi alias rewrite headers qos spamhaus evasive cache cache_disk ssl
|
104
|
+
sudo a2enmod actions fastcgi alias rewrite expires headers qos spamhaus evasive cache cache_disk ssl
|
105
105
|
|
106
106
|
# phpmyadmin apache 2.4
|
107
107
|
sudo cp /etc/phpmyadmin/apache.conf /etc/apache2/conf-available/phpmyadmin.conf
|
@@ -131,4 +131,4 @@ sudo npm install bower -g
|
|
131
131
|
# -----------------------------------------------------
|
132
132
|
|
133
133
|
sudo service apache2 restart
|
134
|
-
sudo service php5-fpm restart
|
134
|
+
sudo service php5-fpm restart
|
data/scripts/ubuntu.sh
CHANGED
@@ -67,7 +67,7 @@ sudo echo -e "<IfModule mod_fastcgi.c>\n AddHandler php5-fcgi .php\n Action php5
|
|
67
67
|
# ------
|
68
68
|
|
69
69
|
# modules
|
70
|
-
sudo a2enmod actions fastcgi alias rewrite headers
|
70
|
+
sudo a2enmod actions fastcgi alias expires rewrite headers
|
71
71
|
|
72
72
|
# phpmyadmin
|
73
73
|
sudo ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bonethug
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.91
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- azt3k
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-11-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|