ish_models 3.1.0.27 → 3.1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0877cf4f0630ecaabf593722fc112a8c03415eb38cec5eb1479fc44d7da7174b'
-  data.tar.gz: 87d3659e67c451b2f5ab56ac4bffe92a5b666bea8de2a8a8e9f097a6c457df15
+  metadata.gz: 19e5b5df0a1181ed7f2aa70bd246edd53498ed6ab30d05476367cf25b8b5e615
+  data.tar.gz: 766dee13aa038acfebb3ea16ff4159f521d0466024cf93725cd64266e91e60b9
 SHA512:
-  metadata.gz: 3abb03c36b58a51b75d3a0cea9fdff8d8c9fe20d7fa1458019debcb863111cf2d39ea7c67cbad4aa5d8c1bdeddb813956c21c75586727173225979291d4d73fa
-  data.tar.gz: 3f5db15afa9d22e226d0e5b3937b1a2a0fa0f7d5b5d8d90b1c1f074a94c1791f134b992a40521f4aa8b3b36013bff952354cb86139b97313c1ba9f4e6ff1ad4c
+  metadata.gz: 0f0ba7c47d6c8efe8d232879109d427bac250819186543bcedf86079cba71928f6375982595e3b94f826bff2b5f9d8509f577da951aa4de96516ce03e7f67f78
+  data.tar.gz: 2379f779878683501c74767c585c303561fb2464f256d252336cfda83279d6c6d78984e5a89173d5d1784898dcdd72b2e27f2c57a7d2d55175e49a8f52e875d4

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/publisher.rb

@@ -0,0 +1,18 @@
+
+class Wco::Publisher
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'wco_daily_publishers'
+
+  KIND_ARTICLE = 'article'
+  KIND_IMAGE   = 'image'
+  field :kind, type: :string
+
+  belongs_to :to_site,      class_name: 'Wco::Site'
+  belongs_to :from_gallery, class_name: 'Wco::Gallery'
+
+  field :title_eval, type: :string ## "#{Time.now.strftime('%Y-%m-%d') Daily Tree}" with the quotes
+
+
+
+end

data/app/models/wco/site.rb

@@ -0,0 +1,17 @@
+
+class Wco::Site
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'wco_sites'
+
+  KIND_DRUPAL = 'drupal'
+  KIND_IG     = 'instagram'
+  KIND_WP     = 'wordpress'
+  field :kind, type: :string
+
+  has_many :daily_publishers, class_name: 'Wco::DailyPublisher'
+
+  field :origin # http://pi.local
+  field :post_url # http://pi.local/node?_format=hal_json
+
+end

data/app/models/wco_email/scheduled_email_action.rb

@@ -60,5 +60,5 @@ class WcoEmail::ScheduledEmailAction
   end
 
 end
-::Sch = WcoEmail::ScheduledEmailAction
+Sch = WcoEmail::ScheduledEmailAction
 

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 )
@@ -93,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
@@ -189,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 )
@@ -196,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.27
+  version: 3.1.0.29
 platform: ruby
 authors:
 - mac_a2141
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-24 00:00:00.000000000 Z
+date: 2023-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,13 +149,17 @@ 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/gallery.rb
 - app/models/wco/lead.rb
 - app/models/wco/leadset.rb
 - app/models/wco/newsitem.rb
 - app/models/wco/office_action.rb
+- app/models/wco/photo.rb
 - app/models/wco/profile.rb
+- app/models/wco/publisher.rb
+- app/models/wco/site.rb
 - app/models/wco/tag.rb
 - app/models/wco_email/campaign.rb
 - app/models/wco_email/context.rb

data/app/jobs/ish_models/application_job.rb

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