ish_models 3.1.0.26 → 3.1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f97bdcb51eb6182a726769934e5153bb3a0822ee4cf1aefcd556531cacbbb2
-  data.tar.gz: dfa075773c4ae11888b6000d7e1d9679a49bfe3fc230c133359b5138f01d8f7b
+  metadata.gz: f77703119867d13489f0e84255ecc02e7a152474455a3c2a884667a8ced99d44
+  data.tar.gz: 00f941a380436c361ba76d5786de744a50d314a6076d5a7ae261de9e86238625
 SHA512:
-  metadata.gz: 7fbb361e4c1fdbd4dae04a1bea306a98cc3ecf4fa3d79eadb2afaf67878400d50648d076aef765ee385541fa7b31f0cd92a8d3cc9705362684fc0acc6396e0f3
-  data.tar.gz: feac5b484692d282f0ee2b0cc57967989a34c978396be2ac461293baaa0078332b88b1a3cfa357e333daef38e3f2d69a0cd927db30590f340cc641614b4bdcd8
+  metadata.gz: 78c31ff8da2c868b49d55ffc7e37765795548bc09a5ab53dab01a4ed0507191a8f0fd34df10703f8d12557f33b8487f77f234acdcf2438125af4dbfd6846fea5
+  data.tar.gz: e1e9f2117ff9ffef73c6bc304512ace708248bf87bdd9c4191759a0b78e9711ff54a54bfc90619137c4ece2b0a37cd90095e3ca444c0d1427a05d023896b2f51

data/app/jobs/wco_hosting/certbot_job.rb

@@ -0,0 +1,24 @@
+
+require 'net/scp'
+require 'open3'
+
+class CertbotJob
+  include Sidekiq::Job
+  sidekiq_options queue: 'wasya_co_rb'
+
+  def perform id
+    puts! id, 'CertbotJob#perform...'
+
+    app = WcoHosting::Appliance.find id
+    cmd = "ssh #{app.serverhost.ssh_host} 'certbot run -d #{app.host} --nginx -n ' "
+    stdout, stderr, status = Open3.capture3(cmd)
+    status = status.to_s.split.last.to_i
+
+    if 0 != status && 0 != app.n_retries
+      app.update_attributes({ n_retries: app.n_retries - 1 })
+      CertbotJob.perform_in( 15.minutes, app.id.to_s )
+    end
+
+  end
+
+end

data/app/models/wco_hosting/appliance.rb

@@ -19,9 +19,8 @@ class WcoHosting::Appliance
   def host
     "#{subdomain}.#{domain}"
   end
-  def route53_zone
-    WcoHosting::Domain.find_by( name: domain ).route53_zone
-  end
+
+  field :n_retries, type: :integer, default: 3
 
   belongs_to :appliance_tmpl, class_name: 'WcoHosting::ApplianceTmpl'
   def tmpl

data/app/models/wco_hosting/serverhost.rb

@@ -32,8 +32,6 @@ class WcoHosting::Serverhost
     # puts! app, 'Serverhost#create_appliance'
 
     create_subdomain(   app )
-    sleep 5
-
     create_volume(      app )
     add_docker_service( app )
     add_nginx_site(     app )
@@ -50,12 +48,6 @@ class WcoHosting::Serverhost
       data: app.serverhost.public_ip,
     )
     client.domain_records.create(record, for_domain: app.domain )
-    record = DropletKit::DomainRecord.new(
-      type: 'AAAA',
-      name: app.subdomain,
-      data: app.serverhost.public_ip,
-    )
-    client.domain_records.create(record, for_domain: app.domain )
   end
 
   ## obsolete _vp_ 2023-12-23
@@ -99,10 +91,6 @@ class WcoHosting::Serverhost
     cmd = "ssh #{ssh_host} 'nginx -s reload ' "
     puts! cmd, 'cmd'
     `#{cmd}`
-
-    cmd = "ssh #{ssh_host} 'certbot run -d #{app.host} --nginx -n ' "
-    puts! cmd, 'cmd'
-    `#{cmd}`
   end
 
   def add_docker_service app
@@ -195,6 +183,7 @@ class WcoHosting::Serverhost
 
     puts! cmd, '#do_exec'
     stdout, stderr, status = Open3.capture3(cmd)
+    status = status.to_s.split.last.to_i
     puts "+++ +++ stdout"
     puts stdout
     # @messages.push( stdout )
@@ -202,7 +191,7 @@ class WcoHosting::Serverhost
     puts stderr
     # @errors.push( stderr )
     puts! status, 'status'
-    # @statuses.push( status.to_s.split.last.to_i )
+    # @statuses.push( status )
   end
 
   def done_exec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.26
+  version: 3.1.0.28
 platform: ruby
 authors:
 - mac_a2141
@@ -149,7 +149,7 @@ files:
 - app/assets/stylesheets/ish_models/application.css
 - app/controllers/ish_models/application_controller.rb
 - app/helpers/ish_models/application_helper.rb
-- app/jobs/ish_models/application_job.rb
+- app/jobs/wco_hosting/certbot_job.rb
 - app/mailers/ish_models/application_mailer.rb
 - app/models/wco/lead.rb
 - app/models/wco/leadset.rb

data/app/jobs/ish_models/application_job.rb

@@ -1,4 +0,0 @@
-module IshModels
-  class ApplicationJob < ActiveJob::Base
-  end
-end