ish_models 3.1.0.20 → 3.1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e376c27171200c2fc25d4b6c7bb8d866a6a01642b009d3302e591d34252a6fd5
-  data.tar.gz: 8912f90aaf505ed8749439308c47a4c91106c59e8ceaa2f42136032d1912e2f2
+  metadata.gz: cf823aeb00ff0318b485b16629c5340c3108f5797f4876e31fcc34b8de3bf995
+  data.tar.gz: b9c7e209d59296da77c0d337722deccd5b6147adf285b45c05e2f7a8b993fa8f
 SHA512:
-  metadata.gz: 5480969543c02a514ca62abeddbdf09541c8a9a8969b88fa742c41bcff0922df086791a8d996b74edaf5bdfe4522d5328b846554d5c16250eea565d23398391c
-  data.tar.gz: 7ecdf9d17d8642a7e053c79782f9dba2f2a6dca6abd040008b80f1bf9047f2a869db2d902815735cc62ce312d9b2100295a2fb15ce645bcd3056cc559b8cfec3
+  metadata.gz: a1993b116f20082efe3102c86170c41faf80fe0c4070b2927b128696139b3a4e3aebf4ff40eeac7ffba079753333c6d0522d11fc51603095af1c39b967c17ef4
+  data.tar.gz: cba2dac300f2cd89cf8a19ab69c59dff727dbe35c4960630eb22e9a0bc59f85b7dc7d63e509bfcc3b226243622aede1342ce6394069dfbcd63f00fccd3ca2ea9

data/app/models/wco_hosting/appliance.rb

@@ -19,6 +19,9 @@ class WcoHosting::Appliance
   def host
     "#{subdomain}.#{domain}"
   end
+  def route53_zone
+    WcoHosting::Domain.find_by( name: domain ).route53_zone
+  end
 
   belongs_to :appliance_tmpl, class_name: 'WcoHosting::ApplianceTmpl'
   def tmpl
@@ -30,7 +33,6 @@ class WcoHosting::Appliance
 
   belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost'
 
-  # field :ip
   field :port
 
   STATE_PENDING = 'state-pending'

data/app/models/wco_hosting/serverhost.rb

@@ -50,8 +50,8 @@ class WcoHosting::Serverhost
     file.close
 
     cmd = "aws route53 change-resource-record-sets \
-      --hosted-zone-id <%= app.route53_zone %> \
-      --change-batch file://<%= file.path %> "
+      --hosted-zone-id #{ app.route53_zone } \
+      --change-batch file://#{ file.path } "
     do_exec( cmd )
   end
 
@@ -168,23 +168,26 @@ class WcoHosting::Serverhost
   end
 
   def do_exec cmd
-    @messages ||= []
-    @errors   ||= []
-    @statuses ||= []
+    # @messages ||= []
+    # @errors   ||= []
+    # @statuses ||= []
 
     puts! cmd, '#do_exec'
     stdout, stderr, status = Open3.capture3(cmd)
     puts "+++ +++ stdout"
     puts stdout
-    @messages.push( stdout )
+    # @messages.push( stdout )
     puts "+++ +++ stderr"
     puts stderr
-    @errors.push( stderr )
+    # @errors.push( stderr )
     puts! status, 'status'
-    @statuses.push( status.to_s.split.last.to_i )
+    # @statuses.push( status.to_s.split.last.to_i )
   end
 
   def done_exec
+    @messages ||= []
+    @errors   ||= []
+    @statuses ||= []
     OpenStruct.new( statuses: @statuses, errors: @errors, messages: @messages )
   end
 

data/app/views/wco_hosting/scripts/nginx_site.conf.erb

@@ -5,6 +5,6 @@ server {
   location / {
     proxy_pass http://127.0.0.1:<%= @app.port %>/;
   }
-  # ssl_certificate /etc/letsencrypt/live/<%= @app.host %>/fullchain.pem; # managed by Certbot
-  # ssl_certificate_key /etc/letsencrypt/live/<%= @app.host %>/privkey.pem; # managed by Certbot
+  ssl_certificate /etc/letsencrypt/live/<%= @app.host %>/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/letsencrypt/live/<%= @app.host %>/privkey.pem; # managed by Certbot
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.20
+  version: 3.1.0.22
 platform: ruby
 authors:
 - mac_a2141