potluck-nginx 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc33a9aab81524eb41a2c734599b947bf3893cf62c72de1edeaee25850961500
-  data.tar.gz: 4802c81ccc6c0fabdb2bbfe2c77db4d9798ac9af9f4a827fb5816ca81c991295
+  metadata.gz: 3c15060a79498a8616523a551ef3031549bbb8b09af0e6d7eb7e329c166b9e8d
+  data.tar.gz: bf716efed8715260cec9439c731e5c799073080fda9f25ebf19b8ea1e09d061b
 SHA512:
-  metadata.gz: 64c6f24f5a322452320f942ea7feefab6afa9970c96786cf0807f261f2209e1f29c4229454e1e65629d408b282abc304821e7163ccf6d622c26802109bb6d2f5
-  data.tar.gz: c5133b05bd80ec716eaf60f7ea41cc0c44c643d54ea729dcc36c6e8df3fdbc0cdeb4037d34097f25233b31f6138468efc64762397338803b4ae5091dfab333d1
+  metadata.gz: 99f5a935c622ec367f01a7852b1992ff1c687cfb575286e7e05b211eb98788b97fa7684f11cd1f1f7afe95ed46cb110a8589602dc8cb288bbfec2d0f9b5e522d
+  data.tar.gz: 4ccc0baa9b708d498bf46b7f925ba8e725eba121c0ed17e5a41d54f281972839a39fb5baa46db9dc153f7fbe88e06709596d62de9d9fdaf1e6503aa8e846c7e2

data/lib/potluck/nginx.rb

@@ -14,8 +14,19 @@ module Potluck
     TEST_CONFIG_REGEX = /nginx: configuration file (?<config>.+) test (failed|is successful)/.freeze
     INCLUDE_REGEX = /^ *include +#{Regexp.escape(ACTIVE_CONFIG_PATTERN)} *;/.freeze
 
+    NON_LAUNCHCTL_COMMANDS = {
+      status: 'ps aux | grep \'[n]ginx: master process\'',
+      start: 'nginx',
+      stop: 'nginx -s stop',
+    }.freeze
+
     def initialize(hosts, port, subdomains: nil, ssl: nil, one_host: false, www: nil, multiple_slashes: nil,
-        multiple_question_marks: nil, trailing_slash: nil, trailing_question_mark: nil, config: {}, **args)
+        multiple_question_marks: nil, trailing_slash: nil, trailing_question_mark: nil, config: {},
+        ensure_host_entries: false, **args)
+      if args[:manage] && !args[:manage].kind_of?(Hash) && !launchctl?
+        args[:manage] = NON_LAUNCHCTL_COMMANDS
+      end
+
       super(**args)
 
       @hosts = Array(hosts).map { |h| h.sub(/^www\./, '') }.uniq
@@ -23,6 +34,7 @@ module Potluck
       @host = @hosts.first
       @port = port
 
+      @ensure_host_entries = ensure_host_entries
       @dir = File.join(DIR, @host)
       @ssl = SSL.new(self, @dir, @host, **ssl) if ssl
 
@@ -45,8 +57,10 @@ module Potluck
     end
 
     def start
+      return unless manage?
+
       @ssl&.ensure_files
-      ensure_host_entries
+      ensure_host_entries if @ensure_host_entries
       ensure_include
 
       write_config
@@ -58,12 +72,16 @@ module Potluck
     end
 
     def stop(hard = false)
+      return unless manage?
+
       deactivate_config
 
       hard || status != :active ? super() : reload
     end
 
     def reload
+      return unless manage?
+
       run('nginx -s reload')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potluck-nginx
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nate Pickens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: potluck
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement