shared-infrastructure 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da04dfe750e140c1338ffdb29a780aec11cc5d67
-  data.tar.gz: f07c6a555130703d979dddec88f58c5eb02b7d51
+  metadata.gz: d045d1733b5238d63ba991f82ee7a0aede2aa8c9
+  data.tar.gz: d8b39349b97ac3cdcf1042429ecd077e34899b72
 SHA512:
-  metadata.gz: f82b761326514cc4ff6f9b3c65e0906546e2fe8f9adee2aa503e26a9069d45a311ffbe0e24ab2b62511345ad7e6031b61e4bca9a10ee429f2e19a3df177cd27a
-  data.tar.gz: 1818e9387a3037ae3ec2a26eeca27a1558fd44cfb0ccbf1d2fc14f276fbfbec51a2b33468cf1a80ab71ff5704288040e6ad8db2ec52f91ddc103673149550ef4
+  metadata.gz: 765448322ab39cbabb387e56bb6d112c6c017949a12d76be23204d40efd09787e176cf033726e702dcc594c7ac5a8abf825106aef60aa37e6384f203b81d6b75
+  data.tar.gz: e471cbb425cf5508aac4e1fcb0ba07b1f412197307982a265434d622cb66a75e42356f8ccd314ee641dc468ed950947db7cc95de0248042d79c777349a6c7e7d

data/lib/shared_infrastructure.rb

@@ -15,6 +15,5 @@ require "shared_infrastructure/runner/base.rb"
 require "shared_infrastructure/runner/reverse_proxy.rb"
 require "shared_infrastructure/runner/static_site.rb"
 require "shared_infrastructure/runner/rails.rb"
-require "shared_infrastructure/runner/deploy.rb"
 require "shared_infrastructure/systemd/systemd.rb"
 require "shared_infrastructure/systemd/rails.rb"

data/lib/shared_infrastructure/domain.rb

@@ -20,6 +20,10 @@ module SharedInfrastructure
       @domain_name = domain_name
     end
 
+    def production_log
+      "/var/www/#{domain_name}/log/production.log"
+    end
+
     def secrets
       File.join(site_root, "secrets")
     end

data/lib/shared_infrastructure/nginx/builder.rb

@@ -170,6 +170,19 @@ Finally, re-run this script to configure nginx for TLS.
                               ENV[var]
                             end
         end
+        SharedInfrastructure::Output.open(File.join("/etc/logrotate.d", "#{domain.domain_name}.conf"), "w") do |io|
+          io << <<~LOGROTATE
+            compress
+
+            #{domain.production_log} {
+              size 1M
+              rotate 4
+              copytruncate
+              missingok
+              notifempty
+            }
+          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 &&

data/lib/shared_infrastructure/runner/base.rb

@@ -73,11 +73,12 @@ module Runner
           "--root DIRECTORY",
           "DIRECTORY. Set a root for files. This options is for debugging.") do |directory|
           Nginx.chroot(directory)
+          SharedInfrastructure::Output.fake_root(directory)
         end
 
         opts.on("-u USER",
           "--user USER",
-          "User to be the owner of certain files. Default: ubuntu.") do |user|
+          "User to be the owner of certain files. Default: the current user.") do |user|
           options[:user] = user
         end
 

data/lib/shared_infrastructure/runner/rails.rb

@@ -22,7 +22,7 @@ module Runner
       # There's almost certainly a refactoring that would make this less
       # convoluted.
       domain_name = options.delete(:domain_name)
-      user = options.delete(:user) || "ubuntu"
+      user = options.delete(:user)
       certificate_domain = options.delete(:certificate_domain)
       accel_location = options.delete(:accel_location)
       domain = SharedInfrastructure::Domain.new(domain_name)

data/lib/shared_infrastructure/runner/static_site.rb

@@ -12,7 +12,7 @@ module Runner
       )
 
       domain_name = options.delete(:domain_name)
-      user = options.delete(:user) || "ubuntu"
+      user = options.delete(:user)
       certificate_domain = options.delete(:certificate_domain)
       domain = SharedInfrastructure::Domain.new(domain_name)
       protocol_class.new(user, certificate_domain, domain: domain)

data/lib/shared_infrastructure/systemd/rails.rb

@@ -44,11 +44,8 @@ module Systemd
             # Environment=PUMA_DEBUG=1
             Environment=RACK_ENV=production
             Environment=RAILS_ENV=production
+            # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shared-infrastructure
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Larry Reid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies: []
 description: 'For static sites, Rails apps, and reverse proxies.
 
@@ -37,7 +37,6 @@ files:
 - lib/shared_infrastructure/nginx/upstream.rb
 - lib/shared_infrastructure/output.rb
 - lib/shared_infrastructure/runner/base.rb
-- lib/shared_infrastructure/runner/deploy.rb
 - lib/shared_infrastructure/runner/rails.rb
 - lib/shared_infrastructure/runner/reverse_proxy.rb
 - lib/shared_infrastructure/runner/static_site.rb

data/lib/shared_infrastructure/runner/deploy.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require "optparse"
-require "production"
-
-module Runner
-  class << self
-    attr_accessor :debug
-  end
-  self.debug = false
-
-  ##
-  # Runner for deployment
-  class Deploy
-    def main
-      process_options
-      raise MissingArgument, "repository required" unless ARGV.size == 1
-      Production.repository = ARGV[0]
-    end
-
-    def process_options
-      options = OptionParser.new do |opts|
-        opts.banner = "Usage: [options] REPOSITORY"
-
-        opts.on("-b BRANCH", "--branch BRANCH", "Branch in repository to deploy.") do |branch|
-          Production.branch = branch
-        end
-
-        opts.on("-d", "--debug", "Print debugging information.") do
-          Runner.debug = true
-        end
-
-        opts.on("-r DIRECTORY",
-          "--root DIRECTORY",
-          "DIRECTORY. Set a root for files. This options is for debugging.") do |directory|
-          Output.fake_root(directory)
-        end
-
-        opts.on("-u REPOSITORY_USER",
-          "--user REPOSITORY_USER",
-          "REPOSITORY_USER. User name for the respository.") do |user|
-          Production.user = user
-        end
-      end
-      options.parse!
-    end
-  end
-
-  class MissingArgument < RuntimeError
-    def initialize(msg)
-      super msg
-    end
-    attr_reader :msg
-  end
-end