cloudkeeper 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8881b79b7f599dc69e620e5cc40b5498bea0510
-  data.tar.gz: 8fb97ca29f661d446c43ade614c2878b0083aedf
+  metadata.gz: 1575648a992c75f43d9488e575503039dd0dabe5
+  data.tar.gz: 53b27e799bf44d51952173d9d8d0b947797472c0
 SHA512:
-  metadata.gz: e7a1016947d951de3e02b9eafaf9999e909b4f4fbdb99e3189e4a0d27745d9fe312fb21ed845b102fba6f2cbbe12ba07a231c16f5ae1428d574f5213a6b7f2d6
-  data.tar.gz: 5fcb1d00873814fc89d0b0eb30a78a4be68756a8e9add8e8d3c0644e7eb5010bc2b4b74c2d1ddd079eee4e7c8056a26fd78d0c76e46dcf628ccde3dbed35496d
+  metadata.gz: 5013979373a3f532088891e4f976f8173f6fc5ae43105d40a1f280a05c9b96be5a29915b1d055c527040602dab45bee6a89ce62f19a53eedde3be72331a84d71
+  data.tar.gz: 4535deed3abcd04989967c2bc85ebc78328a7edc4119acf8de0333bcd65aebdfd9f339554c0b5885be253858865e7350c8ce9c780ce8ab61b2e58f75350db890

data/config/cloudkeeper.yml

@@ -10,6 +10,7 @@ cloudkeeper:
     nginx: /usr/bin/nginx # nginx binary (HTTP server) location
   remote-mode: false # Remote mode starts HTTP server (NGINX) and serves images to backend via HTTP
   nginx:
+    runtime-dir: /var/run/cloudkeeper/ # Runtime directory for NGINX
     error-log-file: /var/log/cloudkeeper/nginx-error.log # File for NGINX error log
     access-log-file: /var/log/cloudkeeper/nginx-access.log # File for NGINX access log
     pid-file: /var/run/cloudkeeper/nginx.pid # NGINX pid file

data/lib/cloudkeeper/cli.rb

@@ -64,6 +64,10 @@ module Cloudkeeper
                   default: Cloudkeeper::Settings['remote-mode'],
                   type: :boolean,
                   desc: 'Remote mode starts HTTP server (NGINX) and serves images to backend via HTTP'
+    method_option :'nginx-runtime-dir',
+                  default: Cloudkeeper::Settings['nginx']['runtime-dir'],
+                  type: :string,
+                  desc: 'Runtime directory for NGINX'
     method_option :'nginx-error-log-file',
                   default: Cloudkeeper::Settings['nginx']['error-log-file'],
                   type: :string,
@@ -142,7 +146,7 @@ module Cloudkeeper
                                     %i[certificate key backend-certificate],
                                     'Authentication configuration missing'
       validate_configuration_group! :'remote-mode',
-                                    %i[nginx-binary nginx-error-log-file nginx-access-log-file nginx-pid-file
+                                    %i[nginx-binary nginx-runtime-dir nginx-error-log-file nginx-access-log-file nginx-pid-file
                                        nginx-ip-address nginx-min-port nginx-max-port],
                                     'NGINX configuration missing'
     end

data/lib/cloudkeeper/nginx/http_server.rb

@@ -21,7 +21,9 @@ module Cloudkeeper
         prepare_configuration_file configuration
         fill_access_data credentials, configuration
 
-        Cloudkeeper::CommandExecutioner.execute Cloudkeeper::Settings[:'nginx-binary'], '-c', conf_file.path
+        Cloudkeeper::CommandExecutioner.execute Cloudkeeper::Settings[:'nginx-binary'],
+                                                '-c', conf_file.path,
+                                                '-p', Cloudkeeper::Settings[:'nginx-runtime-dir']
       rescue Cloudkeeper::Errors::CommandExecutionError, ::IOError => ex
         stop
         raise Cloudkeeper::Errors::NginxError, ex
@@ -30,7 +32,10 @@ module Cloudkeeper
       def stop
         logger.debug 'Stopping NGINX server'
         if conf_file
-          Cloudkeeper::CommandExecutioner.execute Cloudkeeper::Settings[:'nginx-binary'], '-s', 'stop', '-c', conf_file.path
+          Cloudkeeper::CommandExecutioner.execute Cloudkeeper::Settings[:'nginx-binary'],
+                                                  '-s', 'stop',
+                                                  '-c', conf_file.path,
+                                                  '-p', Cloudkeeper::Settings[:'nginx-runtime-dir']
           conf_file.unlink
         end
 

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler