cloudkeeper 1.1.4 → 1.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/config/cloudkeeper.yml +1 -0
- data/lib/cloudkeeper/cli.rb +5 -1
- data/lib/cloudkeeper/nginx/http_server.rb +7 -2
- data/lib/cloudkeeper/version.rb +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: 1575648a992c75f43d9488e575503039dd0dabe5
|
|
4
|
+
data.tar.gz: 53b27e799bf44d51952173d9d8d0b947797472c0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5013979373a3f532088891e4f976f8173f6fc5ae43105d40a1f280a05c9b96be5a29915b1d055c527040602dab45bee6a89ce62f19a53eedde3be72331a84d71
|
|
7
|
+
data.tar.gz: 4535deed3abcd04989967c2bc85ebc78328a7edc4119acf8de0333bcd65aebdfd9f339554c0b5885be253858865e7350c8ce9c780ce8ab61b2e58f75350db890
|
data/config/cloudkeeper.yml
CHANGED
|
@@ -10,6 +10,7 @@ cloudkeeper:
|
|
|
10
10
|
nginx: /usr/bin/nginx # nginx binary (HTTP server) location
|
|
11
11
|
remote-mode: false # Remote mode starts HTTP server (NGINX) and serves images to backend via HTTP
|
|
12
12
|
nginx:
|
|
13
|
+
runtime-dir: /var/run/cloudkeeper/ # Runtime directory for NGINX
|
|
13
14
|
error-log-file: /var/log/cloudkeeper/nginx-error.log # File for NGINX error log
|
|
14
15
|
access-log-file: /var/log/cloudkeeper/nginx-access.log # File for NGINX access log
|
|
15
16
|
pid-file: /var/run/cloudkeeper/nginx.pid # NGINX pid file
|
data/lib/cloudkeeper/cli.rb
CHANGED
|
@@ -64,6 +64,10 @@ module Cloudkeeper
|
|
|
64
64
|
default: Cloudkeeper::Settings['remote-mode'],
|
|
65
65
|
type: :boolean,
|
|
66
66
|
desc: 'Remote mode starts HTTP server (NGINX) and serves images to backend via HTTP'
|
|
67
|
+
method_option :'nginx-runtime-dir',
|
|
68
|
+
default: Cloudkeeper::Settings['nginx']['runtime-dir'],
|
|
69
|
+
type: :string,
|
|
70
|
+
desc: 'Runtime directory for NGINX'
|
|
67
71
|
method_option :'nginx-error-log-file',
|
|
68
72
|
default: Cloudkeeper::Settings['nginx']['error-log-file'],
|
|
69
73
|
type: :string,
|
|
@@ -142,7 +146,7 @@ module Cloudkeeper
|
|
|
142
146
|
%i[certificate key backend-certificate],
|
|
143
147
|
'Authentication configuration missing'
|
|
144
148
|
validate_configuration_group! :'remote-mode',
|
|
145
|
-
%i[nginx-binary nginx-error-log-file nginx-access-log-file nginx-pid-file
|
|
149
|
+
%i[nginx-binary nginx-runtime-dir nginx-error-log-file nginx-access-log-file nginx-pid-file
|
|
146
150
|
nginx-ip-address nginx-min-port nginx-max-port],
|
|
147
151
|
'NGINX configuration missing'
|
|
148
152
|
end
|
|
@@ -21,7 +21,9 @@ module Cloudkeeper
|
|
|
21
21
|
prepare_configuration_file configuration
|
|
22
22
|
fill_access_data credentials, configuration
|
|
23
23
|
|
|
24
|
-
Cloudkeeper::CommandExecutioner.execute Cloudkeeper::Settings[:'nginx-binary'],
|
|
24
|
+
Cloudkeeper::CommandExecutioner.execute Cloudkeeper::Settings[:'nginx-binary'],
|
|
25
|
+
'-c', conf_file.path,
|
|
26
|
+
'-p', Cloudkeeper::Settings[:'nginx-runtime-dir']
|
|
25
27
|
rescue Cloudkeeper::Errors::CommandExecutionError, ::IOError => ex
|
|
26
28
|
stop
|
|
27
29
|
raise Cloudkeeper::Errors::NginxError, ex
|
|
@@ -30,7 +32,10 @@ module Cloudkeeper
|
|
|
30
32
|
def stop
|
|
31
33
|
logger.debug 'Stopping NGINX server'
|
|
32
34
|
if conf_file
|
|
33
|
-
Cloudkeeper::CommandExecutioner.execute Cloudkeeper::Settings[:'nginx-binary'],
|
|
35
|
+
Cloudkeeper::CommandExecutioner.execute Cloudkeeper::Settings[:'nginx-binary'],
|
|
36
|
+
'-s', 'stop',
|
|
37
|
+
'-c', conf_file.path,
|
|
38
|
+
'-p', Cloudkeeper::Settings[:'nginx-runtime-dir']
|
|
34
39
|
conf_file.unlink
|
|
35
40
|
end
|
|
36
41
|
|
data/lib/cloudkeeper/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cloudkeeper
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michal Kimle
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-04-
|
|
11
|
+
date: 2017-04-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|