vps 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d879c725aca451c863ec504e4fd4f7f9089bb5b0
-  data.tar.gz: b0ebe2d831c630da62eb6e8c69452aebbcae4dcc
+  metadata.gz: 591e2f6174b369e271f23bc60b9d9492045259f3
+  data.tar.gz: 5b325e542fbacd8a0cf33df939c58db68c17995b
 SHA512:
-  metadata.gz: b750774204e6f237175c568f6528b9196a1bdf272193cc8ca1bfbfc7d77a539da72835f7160a2998532ae670c576312dcad2dc5eff6e8b3870e7801d68bb0992
-  data.tar.gz: 84ed1b982a9d6e66d70a74845b2a33cbc4ed2c87f2830ae2b3a37b9cb6607ccd30bd870040f2b50a4aa882e0f5c0aeab1f1b194e2c045dce5b1113d393a8f025
+  metadata.gz: 07edf2782cd06c64ad79478dfc51c168552822530083f3170dd702fc46aec3f61600390abb8846cfe1ce7de021f48e5f27a39f1530cfd2cca75ef859c42ce67e
+  data.tar.gz: 7b59c311ae6fda27227c2128c4dbf26338b6a2e8f4740e49b05cb321b24eb28f2d78d45eaf53e58c28b8d3360abeaf02a5d3cfc2c64572af81ed8bb3cd136f0d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## VPS CHANGELOG
 
+### Version 0.1.2 (September 29, 2019)
+
+* Run postload tasks at the end of deployment
+* Fix generating Rails and Rack Dockerfile (installing the correct Bundler version)
+* Include configured :services in the generated docker-compose.yml file
+
 ### Version 0.1.1 (August 12, 2019)
 
 * Initial release

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/vps/cli.rb

@@ -16,6 +16,7 @@ require "active_support/number_helper"
 
 require "vps"
 require "vps/core_ext/string"
+require "vps/core_ext/ostruct"
 require "vps/cli/service"
 require "vps/cli/upstream"
 require "vps/cli/domain"

data/lib/vps/cli/upstream.rb

@@ -9,18 +9,15 @@ module VPS
         path = File.expand_path(path)
 
         unless config[:upstreams].any?{|upstream| upstream[:name] == name}
-          type, tool_version, port = derive_upstream(path)
-          config[:upstreams].push({
+          spec = derive_upstream(path)
+          spec[:nginx] ||= nil
+          config[:upstreams].push(spec.merge({
             :name => name || File.basename(path),
             :path => path,
-            :type => type,
-            :tool_version => tool_version,
-            :port => port,
             :domains => [],
             :email => nil,
-            :compose => nil,
-            :nginx => nil
-          })
+            :compose => nil
+          }))
           VPS.write_config(host, config)
         end
       end
@@ -65,19 +62,28 @@ module VPS
             |> IO.puts()
           ELIXIR
           type = `cd #{path} && mix run -e "#{elixir.strip.gsub(/\n\s+/, " ")}" | tail -n 1`.strip
-          [
-            type,
-            `cd #{path} && mix run -e "System.version() |> IO.puts()" | tail -n 1`.strip,
-            (type == "phoenix") ? 4000 : `cd #{path} && mix run -e ":ranch.info |> hd() |> elem(0) |> :ranch.get_port() |> IO.puts()" | tail -n 1`.strip.to_i
-          ]
+          {
+            type: type,
+            elixir_version: `cd #{path} && mix run -e "System.version() |> IO.puts()" | tail -n 1`.strip,
+            port: (type == "phoenix") ? 4000 : `cd #{path} && mix run -e ":ranch.info |> hd() |> elem(0) |> :ranch.get_port() |> IO.puts()" | tail -n 1`.strip.to_i
+          }
         elsif Dir["#{path}/Gemfile"].any?
           lines = `cd #{path} && BUNDLE_GEMFILE=#{path}/Gemfile bundle list`.split("\n")
           type = %w(rails rack).detect{|gem| lines.any?{|line| line.include?("* #{gem} (")}}
-          [
-            type,
-            `$SHELL -l -c 'cd #{path} && ruby -e "puts RUBY_VERSION"'`.strip,
-            (type == "rails" ? 3000 : 9292) # :'(
-          ]
+          {
+            type: type,
+            ruby_version: `$SHELL -l -c 'cd #{path} && ruby -e "puts RUBY_VERSION"'`.strip,
+            bundler_version: `$SHELL -l -c 'cd #{path} && bundle -v'`.split.last,
+            port: (type == "rails" ? 3000 : 9292) # :'(
+          }.tap do |spec|
+            if type == "rails"
+              spec[:nginx] = {
+                root: "/opt/app/public",
+                try_files: true,
+                proxy_redirect: "off"
+              }
+            end
+          end
         end
       end
 

data/lib/vps/core_ext/ostruct.rb

@@ -0,0 +1,17 @@
+class OpenStruct
+  def self.to_hash(object, hash = {})
+    case object
+    when OpenStruct then
+      object.each_pair do |key, value|
+        hash[key.to_s] = to_hash(value)
+      end
+      hash
+    when Array then
+      object.collect do |value|
+        to_hash(value)
+      end
+    else
+      object
+    end
+  end
+end

data/lib/vps/version.rb

@@ -1,7 +1,7 @@
 module VPS
   MAJOR = 0
   MINOR = 1
-  TINY  = 1
+  TINY  = 2
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/playbooks/deploy/docker.yml

@@ -86,11 +86,11 @@ tasks:
         command:
           - chmod +x {{ release_path }}/init-letsencrypt/{{ upstream.name }}.sh
           - cd {{ release_path }} && if [ ! -d "data/certbot/conf/live/{{ domain:upstream }}" ]; then yes Y | sudo ./init-letsencrypt/{{ upstream.name }}.sh; fi
-  - task: run_tasks
-    tasks: << postload >>
   - description: Starting containers
     task: remote_execute
     command: cd {{ release_path }} && docker-compose up {{ up }} -d
   - description: Checking running docker images
     task: remote_execute
     command: docker ps
+  - task: run_tasks
+    tasks: << postload >>

data/templates/docker/data/nginx/app.conf.erb

@@ -8,14 +8,17 @@ upstream <%= upstream[:name] %> {
   https = domains.first.include?("https://")
   domains = domains.collect{|domain| domain.gsub(/https?:\/\//, "")}.join(" ")
   domain = domains.split(" ")[0]
+  nginx = upstream[:nginx] || {}
   proxy_pass = "http://#{ upstream[:name] }"
 %>
 
 server {
+  <%- unless domains.empty? %>
   listen 80;
   server_name <%= domains %>;
   server_tokens off;
 
+  <%- end %>
   <%- if https %>
   location /.well-known/acme-challenge/ {
     root /var/www/certbot;
@@ -37,15 +40,25 @@ server {
   ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 
   <%- end %>
-  <%- if upstream[:nginx] %>
-<%= upstream[:nginx].gsub("PROXY_PASS", proxy_pass).indent(2) %>
+  <%- if nginx[:root] %>
+  root <%= nginx[:root] %>;
+  <%- end %>
+  <%- if nginx[:try_files] %>
+  try_files $uri @app;
 
   <%- end %>
-  location / {
+  <%- if nginx[:config] %>
+<%= nginx[:config].gsub("PROXY_PASS", proxy_pass).indent(2) %>
+
+  <%- end %>
+  location <%= nginx[:try_files] ? "@app" : "/" %> {
     proxy_pass        <%= proxy_pass %>;
     proxy_set_header  Host $http_host;
     proxy_set_header  X-Real-IP $remote_addr;
     proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+    <%- if nginx[:proxy_redirect] %>
+    proxy_redirect    <%= nginx[:proxy_redirect] %>;
+    <%- end %>
   }
 }
 <%- end %>

data/templates/docker/docker-compose.yml.erb

@@ -1,10 +1,5 @@
 version: "3"
-<%
-https = upstreams.any?{|upstream| upstream[:domains].any?{|domain| domain.include?("https://")}}
-to_yaml = proc do |struct|
-  struct.to_h.inject({}){|h, (k, v)| h[k.to_s] = v; h}.to_yaml
-end
-%>
+<% https = upstreams.any?{|upstream| upstream[:domains].any?{|domain| domain.include?("https://")}} %>
 services:
 
   nginx:
@@ -28,7 +23,7 @@ services:
     command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
 
   certbot:
-    image: certbot/certbot
+    image: certbot/certbot:v0.27.1
     container_name: certbot
     restart: unless-stopped
     volumes:
@@ -36,6 +31,11 @@ services:
       - ./data/certbot/www:/var/www/certbot
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
   <%- end %>
+  <%- services.to_h.each do |name, spec| %>
+
+  <%= name %>:
+<%= OpenStruct.to_hash(spec).to_yaml.sub(/^.*?\n/, "").indent(4) %>
+  <%- end %>
   <%- upstreams.each do |upstream| %>
 
   <%= upstream.name %>:
@@ -46,11 +46,13 @@ services:
       - <%= upstream.port %>
     <%- end %>
     <%- if upstream[:compose] %>
-<%= to_yaml.(upstream[:compose]).sub(/^.*?\n/, "").indent(4) %>
+<%= OpenStruct.to_hash(upstream[:compose]).to_yaml.sub(/^.*?\n/, "").indent(4) %>
     <%- end %>
   <%- end %>
-  <%- services.each do |service, config| %>
+<%- unless (volumes || []).empty? %>
 
-  <%= service %>:
-<%= to_yaml.(config).sub(/^.*?\n/, "").indent(4) %>
-  <%- end %>
+volumes:
+<%- volumes.each do |volume| %>
+  <%= volume %>:
+<%- end %>
+<%- end %>

data/templates/docker/upstream/Dockerfile.phoenix.erb

@@ -1,4 +1,4 @@
-FROM elixir:<%= upstream.tool_version %>-alpine
+FROM elixir:<%= upstream.elixir_version %>-alpine
 
 RUN apk update \
 && apk --no-cache --update add alpine-sdk \

data/templates/docker/upstream/Dockerfile.plug.erb

@@ -1,4 +1,4 @@
-FROM elixir:<%= upstream.tool_version %>-alpine
+FROM elixir:<%= upstream.elixir_version %>-alpine
 
 RUN apk update \
 && apk --no-cache --update add alpine-sdk \

data/templates/docker/upstream/Dockerfile.rack.erb

@@ -1,4 +1,4 @@
-FROM ruby:<%= upstream.tool_version %>-alpine
+FROM ruby:<%= upstream.ruby_version %>-alpine
 
 RUN apk update \
 && apk --no-cache --update add \
@@ -11,5 +11,6 @@ WORKDIR /opt/app
 COPY . .
 
 ENV RACK_ENV=production
+RUN gem install bundler -v <%= upstream.bundler_version %>
 RUN bundle install --without development test
-CMD ["rackup", "config.ru", "-o", "0.0.0.0"]
+CMD ["bundle", "exec", "rackup", "config.ru", "-o", "0.0.0.0"]

data/templates/docker/upstream/Dockerfile.rails.erb

@@ -1,4 +1,4 @@
-FROM ruby:<%= upstream.tool_version %>-alpine
+FROM ruby:<%= upstream.ruby_version %>-alpine
 
 RUN apk update \
 && apk --no-cache --update add \
@@ -11,5 +11,8 @@ WORKDIR /opt/app
 COPY . .
 
 ENV RAILS_ENV=production
+EXPOSE <%= upstream.port %>
+RUN gem install bundler -v <%= upstream.bundler_version %>
 RUN bundle install --without development test
+CMD ["rm", "-f", "tmp/pids/server.pid"]
 CMD ["rails", "server", "-b", "0.0.0.0"]

data/templates/docker/upstream/init-letsencrypt.sh.erb

@@ -17,8 +17,8 @@ fi
 if [ ! -e "$data_path/conf/options-ssl-nginx.conf" ] || [ ! -e "$data_path/conf/ssl-dhparams.pem" ]; then
   echo "### Downloading recommended TLS parameters ..."
   mkdir -p "$data_path/conf"
-  curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf"
-  curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem"
+  curl -s https://raw.githubusercontent.com/certbot/certbot/v0.40.1/certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf"
+  curl -s https://raw.githubusercontent.com/certbot/certbot/v0.40.1/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem"
   echo
 fi
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vps
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -162,6 +162,7 @@ files:
 - lib/vps/cli/playbook/tasks.rb
 - lib/vps/cli/service.rb
 - lib/vps/cli/upstream.rb
+- lib/vps/core_ext/ostruct.rb
 - lib/vps/core_ext/string.rb
 - lib/vps/version.rb
 - playbooks/deploy.yml