shared-infrastructure 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef81857523282a713eba26de715419ab0edbd89e
-  data.tar.gz: 376a56118921b56b22886fcee1a127a664e97c31
+  metadata.gz: 2388baa93ddfa0373ade38fdd49511f4ab4b48f3
+  data.tar.gz: 34351a7ee79549d6c740c3920c11809c4fe628a2
 SHA512:
-  metadata.gz: 0f8bcea463528193ef8ce45bd4da49e7f4db031d44af740a6be1f333a388d444b3c07e5ddf122af03caff58835a6fa94fe751848ff36c4156e8549c536a91b5a
-  data.tar.gz: aa185934ddd22031432fc6e85546ab87032ea4457b30655488bbbc5dae915dcb265824570dd466a1116359b0de9894d9ae348adb9b56e6a55f491e21fe860ecf
+  metadata.gz: 569dd911a7ce4aa8f1eb4619172c7674f9d5b862823ad7325845f37d06cd279ee53e93f324ab374ac977ad65fb7ed647142f4ac450a4c83aa5f1b2a4271843b8
+  data.tar.gz: 8e15c2b82da4e28f1557ae0dd614b4dc5db568b727fb33977c892880090e35ffa45244dc259c8157a1ea13ef1e0aa40d5eea3ab49f86ea09f4b6ddff24034491

data/lib/shared_infrastructure/nginx/accel.rb

@@ -9,18 +9,18 @@ module Nginx
 
     attr_reader :domain, :location_directory
 
-    def alias_string(domain_name)
-      File.join(Nginx.configuration.root_directory(domain ? domain.domain_name : domain_name), location_directory).to_s
+    def alias_string
+      File.join(domain.root, location_directory).to_s
     end
 
     def location
-      "/#{location_directory}"
+      "/__x_accel"
     end
 
     def proxy_set_header(domain_name)
       [
         "  proxy_set_header X-Sendfile-Type X-Accel-Redirect;",
-        "  proxy_set_header X-Accel-Mapping #{alias_string(domain_name)}/=#{location}/;"
+        "  proxy_set_header X-Accel-Mapping #{alias_string}/=#{location}/;"
       ].join("\n")
     end
   end

data/lib/shared_infrastructure/nginx/builder.rb

@@ -23,7 +23,7 @@ sudo nginx -s reload
 
 Then run the following command:
 
-sudo certbot certonly --webroot -w #{Nginx.root_directory(domain.domain_name)} #{Nginx.certbot_domain_names(domain.domain_name)}
+sudo certbot certonly --webroot -w #{Nginx.root_directory(domain.domain_name)} #{domain.certbot_domain_names}
 
 You can test renewal with:
 
@@ -105,12 +105,15 @@ Finally, re-run this script to configure nginx for TLS.
       end
 
       def save
-        FileUtils.mkdir_p(SharedInfrastructure::Output.file_name(domain.root))
+        domain_root = SharedInfrastructure::Output.file_name(domain.root)
+        FileUtils.mkdir_p(domain_root)
         if Process.uid.zero?
           FileUtils.chown(user,
             "www-data",
-            Nginx.root_directory(domain.domain_name))
+            domain_root)
         end
+        # Set the directory gid bit, so files created inside inherit the group.
+        File.chmod(File.stat(domain_root).mode | 0o2000, domain_root)
         super
       end
 

data/lib/shared_infrastructure/nginx/location.rb

@@ -28,7 +28,7 @@ module Nginx
     def to_s(level = 0)
       Lines.new("location #{accel.location} {",
         "  internal;",
-        "  alias #{accel.alias_string(domain ? domain.name : domain_name)};",
+        "  alias #{accel.alias_string};",
         "}").format(level)
     end
 

data/lib/shared_infrastructure/runner/base.rb

@@ -41,7 +41,7 @@ module Runner
         # FIXME: This is only applicable to Rails apps.
         opts.on("-a LOCATION",
           "--accel LOCATION",
-          "Location to serve when app responds with 'X-Accel'") do |accel_location|
+          "Location below application root to serve when app responds with 'X-Accel'") do |accel_location|
           options[:accel_location] = accel_location
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shared-infrastructure
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Larry Reid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies: []
 description: 'For static sites, Rails apps, and reverse proxies.