shared-infrastructure 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d045d1733b5238d63ba991f82ee7a0aede2aa8c9
-  data.tar.gz: d8b39349b97ac3cdcf1042429ecd077e34899b72
+  metadata.gz: ef81857523282a713eba26de715419ab0edbd89e
+  data.tar.gz: 376a56118921b56b22886fcee1a127a664e97c31
 SHA512:
-  metadata.gz: 765448322ab39cbabb387e56bb6d112c6c017949a12d76be23204d40efd09787e176cf033726e702dcc594c7ac5a8abf825106aef60aa37e6384f203b81d6b75
-  data.tar.gz: e471cbb425cf5508aac4e1fcb0ba07b1f412197307982a265434d622cb66a75e42356f8ccd314ee641dc468ed950947db7cc95de0248042d79c777349a6c7e7d
+  metadata.gz: 0f8bcea463528193ef8ce45bd4da49e7f4db031d44af740a6be1f333a388d444b3c07e5ddf122af03caff58835a6fa94fe751848ff36c4156e8549c536a91b5a
+  data.tar.gz: aa185934ddd22031432fc6e85546ab87032ea4457b30655488bbbc5dae915dcb265824570dd466a1116359b0de9894d9ae348adb9b56e6a55f491e21fe860ecf

data/lib/shared_infrastructure/domain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SharedInfrastructure
   class Domain
     def available_site
@@ -20,16 +22,21 @@ module SharedInfrastructure
       @domain_name = domain_name
     end
 
-    def production_log
-      "/var/www/#{domain_name}/log/production.log"
+    def rails_env_log(rails_env = "production")
+      "/var/www/#{domain_name}/log/#{rails_env}.log"
+    end
+
+    def root
+      "/var/www/#{domain_name}"
     end
 
+    # TODO: Remove this if not needed.
     def secrets
       File.join(site_root, "secrets")
     end
 
     def site_root
-      "/var/www/#{domain_name}/html"
+      File.join(root, "html")
     end
 
     attr_reader :domain_name

data/lib/shared_infrastructure/nginx/builder.rb

@@ -105,7 +105,7 @@ Finally, re-run this script to configure nginx for TLS.
       end
 
       def save
-        FileUtils.mkdir_p(Nginx.root_directory(domain.domain_name))
+        FileUtils.mkdir_p(SharedInfrastructure::Output.file_name(domain.root))
         if Process.uid.zero?
           FileUtils.chown(user,
             "www-data",
@@ -120,7 +120,7 @@ Finally, re-run this script to configure nginx for TLS.
     class SiteHttp < Site
       def initialize(user, _certificate_domain = nil, domain: nil)
         super(user,
-          Nginx::StaticServerBlock.new(
+          Nginx::ServerBlock.new(
             server: Nginx::StaticServer.new(domain: domain),
             listen: Nginx::ListenHttp.new,
             location: Nginx::Location.new
@@ -143,7 +143,7 @@ Finally, re-run this script to configure nginx for TLS.
         @certificate_domain = certificate_domain || domain.domain_name
 
         super(user,
-          Nginx::StaticServerBlock.new(
+          Nginx::ServerBlock.new(
             server: Nginx::StaticServer.new(domain: domain),
             listen: Nginx::ListenHttps.new(domain.domain_name, certificate_domain),
             location: Nginx::Location.new
@@ -157,24 +157,28 @@ Finally, re-run this script to configure nginx for TLS.
     end
 
     class Rails < Site
+      def initialize(user, *server_blocks, domain: nil, rails_env: "production")
+        @rails_env = rails_env
+        super user, *server_blocks, domain: domain
+      end
+      attr_reader :rails_env
+
       def save
         env = {}
         %w[SECRET_KEY_BASE
            DATABASE_USERNAME
            DATABASE_PASSWORD
            EMAIL_PASSWORD].each do |var|
-          env[var.to_sym] = if ENV[var].nil?
-                              puts "Enter #{var}: "
-                              $stdin.gets.strip
-                            else
-                              ENV[var]
-                            end
+          if ENV[var].nil?
+            puts "Enter #{var}: "
+            ENV[var] = $stdin.gets.strip
+          end
         end
         SharedInfrastructure::Output.open(File.join("/etc/logrotate.d", "#{domain.domain_name}.conf"), "w") do |io|
           io << <<~LOGROTATE
             compress
 
-            #{domain.production_log} {
+            #{domain.rails_env_log(rails_env)} {
               size 1M
               rotate 4
               copytruncate
@@ -183,19 +187,16 @@ Finally, re-run this script to configure nginx for TLS.
             }
           LOGROTATE
         end &&
-        File.open(SharedInfrastructure::Output.file_name(File.join(domain.site_root, "secrets")), "w", 0o600) do |io|
-          io << env.map { |pair| "#{pair[0]}=#{pair[1]}\n" }.join
-        end &&
-          Systemd::Rails.write_unit_file(domain.domain_name, domain) &&
+          Systemd::Rails.write_unit_file(domain.domain_name, domain, rails_env) &&
           super
       end
     end
 
     class RailsHttp < Rails
-      def initialize(user, _certificate_domain = nil, accel_location: nil, domain: nil)
+      def initialize(user, _certificate_domain = nil, accel_location: nil, domain: nil, rails_env: "production")
         accel_location = Accel.new(accel_location, domain: domain) if accel_location
         super(user,
-            Nginx::RailsServerBlock.new(
+            Nginx::ServerBlock.new(
               upstream: Nginx::Upstream.new(domain.domain_name),
               server: Nginx::RailsServer.new(domain: domain),
               listen: Nginx::ListenHttp.new,
@@ -207,7 +208,8 @@ Finally, re-run this script to configure nginx for TLS.
               accel_location: accel_location,
               domain: domain
             ),
-            domain: domain
+            domain: domain,
+            rails_env: rails_env
           )
       end
     end
@@ -215,11 +217,11 @@ Finally, re-run this script to configure nginx for TLS.
     class RailsHttps < Rails
       include Https
 
-      def initialize(user, certificate_domain = nil, accel_location: nil, domain: nil)
+      def initialize(user, certificate_domain = nil, accel_location: nil, domain: nil, rails_env: "production")
         @certificate_domain = certificate_domain || domain.domain_name
         accel_location = Accel.new(accel_location, domain) if accel_location
         super(user,
-          Nginx::RailsServerBlock.new(
+          Nginx::ServerBlock.new(
             upstream: Nginx::Upstream.new(domain.domain_name),
             server: Nginx::RailsServer.new(domain: domain),
             listen: Nginx::ListenHttps.new(domain.domain_name, certificate_domain),
@@ -232,7 +234,8 @@ Finally, re-run this script to configure nginx for TLS.
             domain: domain
           ),
           Nginx::TlsRedirectServerBlock.new(domain.domain_name),
-          domain: domain
+          domain: domain,
+          rails_env: rails_env
         )
       end
 

data/lib/shared_infrastructure/nginx/server_block.rb

@@ -42,31 +42,6 @@ SERVER_BLOCK
     attr_reader :accel_location, :domain, :listen, :location, :server, :upstream
   end
 
-  class SiteServerBlock < ServerBlock
-    def make_root_directory(root_directory)
-      FileUtils.mkdir_p(server.root_directory)
-      if Process.uid.zero?
-        FileUtils.chown(server.user,
-          "www-data",
-          server.root_directory)
-      end
-    end
-
-    def save
-      make_root_directory(root_directory)
-      super
-    end
-  end
-
-  class RailsServerBlock < SiteServerBlock
-    def root_directory
-      File.join(domain.site_root, "/public")
-    end
-  end
-
-  class StaticServerBlock < SiteServerBlock
-  end
-
   class TlsRedirectServerBlock < ServerBlock
     def initialize(domain_name)
       super(

data/lib/shared_infrastructure/runner/base.rb

@@ -56,6 +56,10 @@ module Runner
           Runner.debug = true
         end
 
+        opts.on("-d RAILS_ENV", "--rails-env RAILS_ENV", "Build files for the specified RAILS_ENV") do |rails_env|
+          options[:rails_env] = rails_env
+        end
+
         opts.on("-P PROTOCOL",
           "--protocol PROTOCOL",
           "HTTP|HTTPS. Default: HTTPS if key files exist, else HTTP.") do |protocol|

data/lib/shared_infrastructure/runner/rails.rb

@@ -25,8 +25,10 @@ module Runner
       user = options.delete(:user)
       certificate_domain = options.delete(:certificate_domain)
       accel_location = options.delete(:accel_location)
+      # FIXME: This is the wrong way to do this.
+      rails_env = options.delete(:rails_env) { "production" }
       domain = SharedInfrastructure::Domain.new(domain_name)
-      protocol_class.new(user, certificate_domain, accel_location: accel_location, domain: domain)
+      protocol_class.new(user, certificate_domain, accel_location: accel_location, domain: domain, rails_env: rails_env)
     end
   end
 end

data/lib/shared_infrastructure/systemd/rails.rb

@@ -11,7 +11,7 @@ module Systemd
         "redis." + domain_name
       end
 
-      def write_unit_file(domain_name, domain)
+      def write_unit_file(domain_name, domain, rails_env = "production")
         # if ENV["SECRET_KEY_BASE"].nil? ||
         #    ENV["DATABASE_USERNAME"].nil? ||
         #    ENV["DATABASE_PASSWORD"].nil? ||
@@ -42,17 +42,20 @@ module Systemd
 
             # Helpful for debugging socket activation, etc.
             # Environment=PUMA_DEBUG=1
-            Environment=RACK_ENV=production
-            Environment=RAILS_ENV=production
+            Environment=RACK_ENV=#{rails_env}
+            Environment=RAILS_ENV=#{rails_env}
             # FIXME: The following is the wrong place
-            EnvironmentFile=#{domain.secrets}
+            Environment=SECRET_KEY_BASE=#{ENV['SECRET_KEY_BASE']}
+            Environment=DATABASE_USERNAME=#{ENV['DATABASE_USERNAME']}
+            Environment=DATABASE_PASSWORD=#{ENV['DATABASE_PASSWORD']}
+            Environment=EMAIL_PASSWORD=#{ENV['EMAIL_PASSWORD']}
             Environment=REDIS_URL=unix:///tmp/#{redis_location(domain_name)}.sock
 
             # The command to start Puma
             # NOTE: TLS would be handled by Nginx
             ExecStart=#{Nginx.root_directory(domain_name)}/bin/puma -b #{puma_uri(domain_name)} \
-              --redirect-stdout=#{Nginx.root_directory(domain_name)}/log/puma-production.stdout.log \
-              --redirect-stderr=#{Nginx.root_directory(domain_name)}/log/puma-production.stderr.log
+              --redirect-stdout=#{Nginx.root_directory(domain_name)}/log/puma-#{rails_env}.stdout.log \
+              --redirect-stderr=#{Nginx.root_directory(domain_name)}/log/puma-#{rails_env}.stderr.log
             # ExecStart=/usr/local/bin/puma -b tcp://#{puma_uri(domain_name)}
 
             Restart=always

metadata

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