daddy 0.5.34 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/itamae/cookbooks/nginx/config/gitbucket.rb +1 -1
  3. data/itamae/cookbooks/nginx/install.rb +18 -20
  4. data/itamae/cookbooks/nginx/{sha256sum.txt → nginx-1.13.5_sha256sum.txt} +0 -0
  5. data/lib/daddy/version.rb +8 -2
  6. metadata +65 -71
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 889bc9175a22de76ee098ea2c28bb5d9a0c7d423
4
- data.tar.gz: 3d579b61141df5db090e8cb02983727955898c59
3
+ metadata.gz: f899214f3cbeadeb3fb451453508137be4cdc895
4
+ data.tar.gz: 5da79b2b12b6bab34e98cb60f803fa8132598b6f
5
5
  SHA512:
6
- metadata.gz: 6332bd58b2994bd6cef16fba7ce21617cf960bbc11289e8027105ffca40d1f9d910a9547e164d2482abd473ce918b22b6033adcc718ab392c7790fe078d819eb
7
- data.tar.gz: 8f68ab34e3b5f38936c6970f95470f1f01c6007ab1d98819173177cef16bddbf261f8eabcabb5f7c1294b6da8cf9182bf368fff8ba2b75768bb7e547c3cf606b
6
+ metadata.gz: 91d11028da72b3d763c4f8eab72824cd22cfbe88c034d9140c0c9338e195935d0e8ed48bf09e865ff258444b42366f6ac1af78ec7be801e42cfc3399864f331a
7
+ data.tar.gz: 44f9dc04a91aa5ea9f7ec35c129117e17a4a40c0de31a3c344e019ac73d7f2ff57e1d407d35c16d031f621ea7d1034c0559a6354898f315a3e45a703b8835ddc
data/itamae/cookbooks/nginx/config/gitbucket.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  require 'daddy/itamae'
2
2
 
3
- template "/etc/nginx/conf.d/servers/gitbucket.conf" do
3
+ template '/etc/nginx/conf.d/servers/gitbucket.conf' do
4
4
  user 'root'
5
5
  owner 'root'
6
6
  group 'root'
data/itamae/cookbooks/nginx/install.rb CHANGED
@@ -1,8 +1,5 @@
1
1
  require 'daddy/itamae'
2
2
 
3
- dad_nginx_checksum = File.join(File.dirname(__FILE__), 'sha256sum.txt')
4
- dad_nginx_version = '1.13.5'
5
-
6
3
  directory 'tmp'
7
4
 
8
5
  # install destination
@@ -24,9 +21,9 @@ end
24
21
  execute 'download nginx' do
25
22
  cwd 'tmp'
26
23
  command <<-EOF
27
- wget https://nginx.org/download/nginx-#{dad_nginx_version}.tar.gz
24
+ wget https://nginx.org/download/nginx-#{Daddy::NGINX_VERSION}.tar.gz
28
25
  EOF
29
- not_if "sha256sum -c #{dad_nginx_checksum}"
26
+ not_if "sha256sum -c #{::File.join(::File.dirname(__FILE__), "nginx-#{Daddy::NGINX_VERSION}_sha256sum.txt")}"
30
27
  end
31
28
 
32
29
  # module sources
@@ -37,27 +34,28 @@ include_recipe 'modules/passenger'
37
34
  execute 'build nginx' do
38
35
  cwd 'tmp'
39
36
  command <<-EOF
40
- rm -Rf nginx-#{dad_nginx_version}/
41
- tar zxf nginx-#{dad_nginx_version}.tar.gz
42
- cd nginx-#{dad_nginx_version}
43
- sudo ./configure \
44
- --prefix=/opt/nginx/nginx-#{dad_nginx_version} \
45
- --conf-path=/etc/nginx/nginx.conf \
46
- --pid-path=/run/nginx.pid \
47
- --with-http_ssl_module \
48
- --add-dynamic-module=/opt/nginx-rtmp-module/v1.1.11 \
49
- --add-dynamic-module=$(passenger-config --nginx-addon-dir)
50
- sudo chown -R #{ENV['USER']}:#{ENV['USER']} ./
51
- make
52
- sudo make install
37
+ rm -Rf nginx-#{Daddy::NGINX_VERSION}/
38
+ tar zxf nginx-#{Daddy::NGINX_VERSION}.tar.gz
39
+ pushd nginx-#{Daddy::NGINX_VERSION}
40
+ sudo ./configure \
41
+ --prefix=/opt/nginx/nginx-#{Daddy::NGINX_VERSION} \
42
+ --conf-path=/etc/nginx/nginx.conf \
43
+ --pid-path=/run/nginx.pid \
44
+ --with-http_ssl_module \
45
+ --add-dynamic-module=/opt/nginx-rtmp-module/v1.1.11 \
46
+ --add-dynamic-module=$(passenger-config --nginx-addon-dir)
47
+ sudo chown -R #{ENV['USER']}:#{ENV['USER']} ./
48
+ make
49
+ sudo make install
50
+ popd
53
51
  EOF
54
- not_if "test -e /opt/nginx/nginx-#{dad_nginx_version}"
52
+ not_if "test -e /opt/nginx/nginx-#{Daddy::NGINX_VERSION}"
55
53
  end
56
54
 
57
55
  link 'current' do
58
56
  user 'root'
59
57
  cwd '/opt/nginx'
60
- to "nginx-#{dad_nginx_version}"
58
+ to "nginx-#{Daddy::NGINX_VERSION}"
61
59
  force true
62
60
  end
63
61
 
data/lib/daddy/version.rb CHANGED
@@ -1,7 +1,13 @@
1
1
  module Daddy
2
2
  VERSION = [
3
3
  VERSION_MAJOR = '0',
4
- VERSION_MINOR = '5',
5
- VERSION_REVISION = '34'
4
+ VERSION_MINOR = '6',
5
+ VERSION_REVISION = '0'
6
+ ].join('.')
7
+
8
+ NGINX_VERSION = [
9
+ NGINX_VERSION_MAJOR = '1',
10
+ NGINX_VERSION_MINOR = '13',
11
+ NGINX_VERSION_REVISION = '5'
6
12
  ].join('.')
7
13
  end
metadata CHANGED
@@ -1,57 +1,57 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: daddy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.34
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - ichy
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-01 00:00:00.000000000 Z
11
+ date: 2017-10-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: capybara
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '2.7'
19
+ version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '2.7'
26
+ version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: ci_reporter
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '2.0'
33
+ version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '2.0'
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: faraday
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '0.9'
47
+ version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '0.9'
54
+ version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: hashie
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -70,204 +70,198 @@ dependencies:
70
70
  name: highline
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: '1.7'
75
+ version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: '1.7'
82
+ version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: holiday_jp
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
- version: '0.4'
89
+ version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - "~>"
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
- version: '0.4'
96
+ version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: i18n
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
- version: '0.7'
103
+ version: '0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - "~>"
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
- version: '0.7'
110
+ version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: itamae
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - ">="
116
116
  - !ruby/object:Gem::Version
117
- version: '1.9'
117
+ version: '0'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - ">="
123
123
  - !ruby/object:Gem::Version
124
- version: '1.9'
124
+ version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: ohai
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - ">="
130
130
  - !ruby/object:Gem::Version
131
- version: '8.10'
131
+ version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - "~>"
136
+ - - ">="
137
137
  - !ruby/object:Gem::Version
138
- version: '8.10'
138
+ version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rails
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - ">="
144
144
  - !ruby/object:Gem::Version
145
- version: 4.2.0
146
- - - "<"
147
- - !ruby/object:Gem::Version
148
- version: 5.1.0
145
+ version: '0'
149
146
  type: :runtime
150
147
  prerelease: false
151
148
  version_requirements: !ruby/object:Gem::Requirement
152
149
  requirements:
153
150
  - - ">="
154
151
  - !ruby/object:Gem::Version
155
- version: 4.2.0
156
- - - "<"
157
- - !ruby/object:Gem::Version
158
- version: 5.1.0
152
+ version: '0'
159
153
  - !ruby/object:Gem::Dependency
160
154
  name: database_cleaner
161
155
  requirement: !ruby/object:Gem::Requirement
162
156
  requirements:
163
- - - "~>"
157
+ - - ">="
164
158
  - !ruby/object:Gem::Version
165
- version: '1.5'
159
+ version: '0'
166
160
  type: :development
167
161
  prerelease: false
168
162
  version_requirements: !ruby/object:Gem::Requirement
169
163
  requirements:
170
- - - "~>"
164
+ - - ">="
171
165
  - !ruby/object:Gem::Version
172
- version: '1.5'
166
+ version: '0'
173
167
  - !ruby/object:Gem::Dependency
174
168
  name: closer
175
169
  requirement: !ruby/object:Gem::Requirement
176
170
  requirements:
177
171
  - - ">="
178
172
  - !ruby/object:Gem::Version
179
- version: '0.5'
173
+ version: '0'
180
174
  type: :development
181
175
  prerelease: false
182
176
  version_requirements: !ruby/object:Gem::Requirement
183
177
  requirements:
184
178
  - - ">="
185
179
  - !ruby/object:Gem::Version
186
- version: '0.5'
180
+ version: '0'
187
181
  - !ruby/object:Gem::Dependency
188
182
  name: redis
189
183
  requirement: !ruby/object:Gem::Requirement
190
184
  requirements:
191
- - - "~>"
185
+ - - ">="
192
186
  - !ruby/object:Gem::Version
193
- version: '3.3'
187
+ version: '0'
194
188
  type: :development
195
189
  prerelease: false
196
190
  version_requirements: !ruby/object:Gem::Requirement
197
191
  requirements:
198
- - - "~>"
192
+ - - ">="
199
193
  - !ruby/object:Gem::Version
200
- version: '3.3'
194
+ version: '0'
201
195
  - !ruby/object:Gem::Dependency
202
196
  name: redis-namespace
203
197
  requirement: !ruby/object:Gem::Requirement
204
198
  requirements:
205
- - - "~>"
199
+ - - ">="
206
200
  - !ruby/object:Gem::Version
207
- version: '1.5'
201
+ version: '0'
208
202
  type: :development
209
203
  prerelease: false
210
204
  version_requirements: !ruby/object:Gem::Requirement
211
205
  requirements:
212
- - - "~>"
206
+ - - ">="
213
207
  - !ruby/object:Gem::Version
214
- version: '1.5'
208
+ version: '0'
215
209
  - !ruby/object:Gem::Dependency
216
210
  name: resque
217
211
  requirement: !ruby/object:Gem::Requirement
218
212
  requirements:
219
- - - "~>"
213
+ - - ">="
220
214
  - !ruby/object:Gem::Version
221
- version: '1.26'
215
+ version: '0'
222
216
  type: :development
223
217
  prerelease: false
224
218
  version_requirements: !ruby/object:Gem::Requirement
225
219
  requirements:
226
- - - "~>"
220
+ - - ">="
227
221
  - !ruby/object:Gem::Version
228
- version: '1.26'
222
+ version: '0'
229
223
  - !ruby/object:Gem::Dependency
230
224
  name: resque-scheduler
231
225
  requirement: !ruby/object:Gem::Requirement
232
226
  requirements:
233
- - - "~>"
227
+ - - ">="
234
228
  - !ruby/object:Gem::Version
235
- version: '4.0'
229
+ version: '0'
236
230
  type: :development
237
231
  prerelease: false
238
232
  version_requirements: !ruby/object:Gem::Requirement
239
233
  requirements:
240
- - - "~>"
234
+ - - ">="
241
235
  - !ruby/object:Gem::Version
242
- version: '4.0'
236
+ version: '0'
243
237
  - !ruby/object:Gem::Dependency
244
238
  name: simplecov
245
239
  requirement: !ruby/object:Gem::Requirement
246
240
  requirements:
247
- - - "~>"
241
+ - - ">="
248
242
  - !ruby/object:Gem::Version
249
- version: '0.11'
243
+ version: '0'
250
244
  type: :development
251
245
  prerelease: false
252
246
  version_requirements: !ruby/object:Gem::Requirement
253
247
  requirements:
254
- - - "~>"
248
+ - - ">="
255
249
  - !ruby/object:Gem::Version
256
- version: '0.11'
250
+ version: '0'
257
251
  - !ruby/object:Gem::Dependency
258
252
  name: simplecov-rcov
259
253
  requirement: !ruby/object:Gem::Requirement
260
254
  requirements:
261
- - - "~>"
255
+ - - ">="
262
256
  - !ruby/object:Gem::Version
263
- version: '0.2'
257
+ version: '0'
264
258
  type: :development
265
259
  prerelease: false
266
260
  version_requirements: !ruby/object:Gem::Requirement
267
261
  requirements:
268
- - - "~>"
262
+ - - ">="
269
263
  - !ruby/object:Gem::Version
270
- version: '0.2'
264
+ version: '0'
271
265
  description: Daddy helps me build web applications since daddy knows some good practices.
272
266
  email: ichylinux@gmail.com
273
267
  executables:
@@ -301,7 +295,7 @@ files:
301
295
  - itamae/cookbooks/nginx/install.rb
302
296
  - itamae/cookbooks/nginx/modules/nginx-rtmp-module.rb
303
297
  - itamae/cookbooks/nginx/modules/passenger.rb
304
- - itamae/cookbooks/nginx/sha256sum.txt
298
+ - itamae/cookbooks/nginx/nginx-1.13.5_sha256sum.txt
305
299
  - itamae/cookbooks/nginx/templates/passenger.conf.erb
306
300
  - itamae/cookbooks/nginx/templates/unicorn.conf.erb
307
301
  - itamae/cookbooks/obs_studio/install.rb