ish_models 3.1.0.15 → 3.1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 878db6bcfd78a87582b23a3edf1fae48aba69227e3147867bb72dc27cf6e4fee
-  data.tar.gz: 6dd6d2b220b3c5ee8898cbe0801ccadc4f76a1a4247e5086fd825bb1d7988cd1
+  metadata.gz: fc3056e321f83d069cb82d5faa4223206443d4bd187e12fe2fa242d0a235ec98
+  data.tar.gz: fecd205816177999eca53542fc1fa4d3900ebb2f050118001e82f49131823253
 SHA512:
-  metadata.gz: c1cdd9e7fa1872d4af5df0aefe4af23edd0f8a00a6e6acbf6feccd0298f4a61d1b3a522a31f8de134c0174adfc62b5625b06cf7aba2635a89d7788a05431d557
-  data.tar.gz: 6a6d9e6467c0eb65a982bda906e83cfd628577a7f24fe6d04bebb5a3349bbf77eae1abf38e4b44e69dc911e93dd9ef19516cf191b5eb82ec504b79b0ba43137d
+  metadata.gz: 474a5d1e4245662c1dc26a7827d503b40716bc4a2162ea2cf865a35ac7e73fbea6e6de2f7f89bc434112da188be61ed6daeb110ca0e493aa8c39536c39e8035b
+  data.tar.gz: 73a7ef052debb57b8f021209529008184568128f4d419f4ba763f214961f2e3162fef8f4337e120e2399fd71545f22d5500330be30db2751a426d3aa4c92ad27

data/README.txt

@@ -0,0 +1,2 @@
+
+IshModels, soon to be WcoModels

data/{lib → app/models}/wco/leadset.rb

@@ -5,18 +5,18 @@ class Wco::Leadset
   store_in collection: 'wco_leadsets'
 
   field :company_url
-  def domain; company_url; end
+  def domain; company_url; end ## @TODO: remove
   validates :company_url, presence: true, uniqueness: true
   index({ company_url: 1 }, { name: 'company_url' })
 
   field :email
   index({ email: 1 }, { name: 'email' })
-  validates :email, presence: true, uniqueness: true
+  validates :email, presence: true # , uniqueness: true ## @TODO: should it be unique? _vp_ 2023-12-22
 
   has_many :profiles,    class_name: 'Wco::Profile',           inverse_of: :leadset
   has_many :appliances,  class_name: 'WcoHosting::Appliance',  inverse_of: :leadset
 
-  has_many :serverhosts, class_name: 'WcoHosting::Serverhost', inverse_of: :leadset
+  has_and_belongs_to_many :serverhosts, class_name: 'WcoHosting::Serverhost' # , inverse_of: :leadset
   def next_serverhost
     serverhosts.first
   end

data/app/models/wco/newsitem.rb

@@ -0,0 +1,9 @@
+
+
+class Wco::Newsitem
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'wco_newsitems'
+
+  belongs_to :profile, class_name: 'Wco::Profile', optional: true
+end

data/{lib → app/models}/wco/profile.rb

@@ -12,6 +12,8 @@ class Wco::Profile
 
   belongs_to :leadset, class_name: 'Wco::Leadset', inverse_of: :profile, optional: true
 
+  has_many :newsitems, class_name: 'Wco::Newsitem'
+
   def self.list
     all.map { |p| [ p.email, p.id ] }
   end

data/{lib → app/models}/wco_hosting/appliance.rb

@@ -4,21 +4,14 @@ class WcoHosting::Appliance
   include Mongoid::Timestamps
   store_in collection: 'wco_appliances'
 
-  field :name
-  validates :name, uniqueness: { scope: :leadset }, presence: true
-  before_validation :set_name, on: :create, unless: ->{ name }
-  def set_name
-    name = "#{Time.now.strftime('%Y%m%d')}-#{(0...8).map { (65 + rand(26)).chr }.join}"
-  end
-
   belongs_to :leadset, class_name: 'Wco::Leadset', inverse_of: :appliances
 
-
-
-
-  field :kind
-
   field :service_name
+  before_validation :set_service_name, on: :create, unless: ->{ service_name }
+  def set_service_name
+    self[:service_name] = host.gsub(".", "_")
+  end
+
   field :environment
 
   field :subdomain
@@ -31,6 +24,9 @@ class WcoHosting::Appliance
   def tmpl
     appliance_tmpl
   end
+  def kind
+    tmpl.kind
+  end
 
   belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost'
 

data/{lib → app/models}/wco_hosting/serverhost.rb

@@ -1,5 +1,6 @@
 
 require 'net/scp'
+require 'open3'
 
 class WcoHosting::Serverhost
   include Mongoid::Document
@@ -7,10 +8,12 @@ class WcoHosting::Serverhost
   # include Mongoid::Autoinc
   store_in collection: 'wco_serverhosts'
 
+  WORKDIR = "/opt/projects/docker"
+
   field     :name, type: :string
   validates :name, uniqueness: { scope: :leadset }, presence: true
 
-  belongs_to :leadset, class_name: 'Wco::Leadset'
+  has_and_belongs_to_many :leadsets, class_name: 'Wco::Leadset'
 
   field :next_port, type: :integer, default: 8000
 
@@ -24,10 +27,39 @@ class WcoHosting::Serverhost
 
   has_many :appliances, class_name: 'WcoHosting::Appliance'
 
+  def create_appliance app
+    # puts! app, 'Serverhost#create_appliance'
+
+    create_volume(      app )
+    add_docker_service( app )
+    add_nginx_site(     app )
+    # load_database( app )
+
+    ##
+    ## DNS add_subdomain
+    ##
+    # ac   = ActionController::Base.new
+    # ac.instance_variable_set( :@app, app )
+    # rendered_str = ac.render_to_string("wco_hosting/scripts/create_subdomain.json")
+    # # puts '+++ add_subdomain rendered_str:'; print rendered_str
+
+    # file = Tempfile.new('prefix')
+    # file.write rendered_str
+    # file.close
+
+    # cmd = "aws route53 change-resource-record-sets \
+    #   --hosted-zone-id <%= app.route53_zone %> \
+    #   --change-batch file://<%= file.path %> "
+    # puts! cmd, 'cmd'
+    # `#{cmd}`
+
+    update({ next_port: app.serverhost.next_port + 1 })
+  end
+
   def add_nginx_site app
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@app, app )
-    rendered_str = ac.render_to_string("scripts/nginx_site.conf")
+    rendered_str = ac.render_to_string("wco_hosting/scripts/nginx_site.conf")
     puts '+++ add_nginx_site rendered_str:'
     print rendered_str
 
@@ -47,21 +79,18 @@ class WcoHosting::Serverhost
     puts! cmd, 'cmd'
     `#{cmd}`
 
-    cmd = "ssh #{ssh_host} 'certbot run -d #{app.origin} --nginx -n ' "
+    cmd = "ssh #{ssh_host} 'certbot run -d #{app.host} --nginx -n ' "
     puts! cmd, 'cmd'
     `#{cmd}`
-
   end
 
-  WORKDIR = "/opt/projects/docker"
-
   def add_docker_service app
     puts! app, '#add_docker_service'
 
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@app, app )
     ac.instance_variable_set( :@workdir, WORKDIR )
-    rendered_str = ac.render_to_string("docker-compose/dc-#{app.kind}")
+    rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-#{app.tmpl.kind}")
     puts '+++ add_docker_service rendered_str:'
     print rendered_str
 
@@ -87,7 +116,7 @@ class WcoHosting::Serverhost
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@app, app )
     ac.instance_variable_set( :@workdir, WORKDIR )
-    rendered_str = ac.render_to_string("scripts/create_volume")
+    rendered_str = ac.render_to_string("wco_hosting/scripts/create_volume")
     # puts '+++ create_volume rendered_str:'
     # print rendered_str
 
@@ -101,7 +130,7 @@ class WcoHosting::Serverhost
     `#{cmd}`
 
     cmd = "ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; \
-      #{WORKDIR}/scripts/create_volume ' "
+      #{WORKDIR}/wco_hosting/scripts/create_volume ' "
     puts! cmd, 'cmd'
     `#{cmd}`
 
@@ -109,12 +138,14 @@ class WcoHosting::Serverhost
   end
 
   def create_volume app
+    # puts! app.service_name, 'Serverhost#create_volume'
+
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@app, app )
     ac.instance_variable_set( :@workdir, WORKDIR )
-    rendered_str = ac.render_to_string("scripts/create_volume")
-    # puts '+++ create_volume rendered_str:'
-    # print rendered_str
+    rendered_str = ac.render_to_string("wco_hosting/scripts/create_volume")
+    puts '+++ create_volume rendered_str:'
+    print rendered_str
 
     file = Tempfile.new('prefix')
     file.write rendered_str
@@ -122,15 +153,13 @@ class WcoHosting::Serverhost
     # puts! file.path, 'file.path'
 
     cmd = "scp #{file.path} #{ssh_host}:#{WORKDIR}/scripts/create_volume"
-    puts! cmd, 'cmd'
-    `#{cmd}`
+    do_exec( cmd )
 
-    cmd = "ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; \
-      #{WORKDIR}/scripts/create_volume ' "
-    puts! cmd, 'cmd'
-    `#{cmd}`
+    cmd = "ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; #{WORKDIR}/scripts/create_volume ' "
+    do_exec( cmd )
 
     puts 'ok #create_volume'
+    return done_exec
   end
 
   def self.list
@@ -138,4 +167,26 @@ class WcoHosting::Serverhost
     # all.map { |s| [s.name, s.id] }
   end
 
+  def do_exec cmd
+    @messages ||= []
+    @errors   ||= []
+    @statuses ||= []
+
+    puts! cmd, '#do_exec'
+    stdout, stderr, status = Open3.capture3(cmd)
+    puts "+++ +++ stdout"
+    puts stdout
+    @messages.push( stdout )
+    puts "+++ +++ stderr"
+    puts stderr
+    @errors.push( stderr )
+    puts! status, 'status'
+    @statuses.push( status.to_s.split.last.to_i )
+  end
+
+  def done_exec
+    OpenStruct.new( statuses: @statuses, errors: @errors, messages: @messages )
+  end
+
+
 end

data/app/views/wco_hosting/docker-compose/dc-any.erb

@@ -0,0 +1,16 @@
+version: '3.2'
+
+services:
+
+  <%= @app.service_name %>:
+    image: <%= @app.tmpl.image %>
+    volumes:
+      - type: bind
+        source: volumes/<%= @app.service_name %>_data
+        target: /var/www/html
+    ports:
+      - <%= @app.port %>:80
+    restart: always
+
+
+

data/app/views/wco_hosting/docker-compose/dc-helloworld.erb

@@ -0,0 +1,16 @@
+version: '3.2'
+
+services:
+
+  <%= @app.service_name %>:
+    image: <%= @app.tmpl.image %>
+    volumes:
+      - type: bind
+        source: volumes/<%= @app.service_name %>_data
+        target: /var/www/html
+    ports:
+      - <%= @app.port %>:80
+    restart: always
+
+
+

data/app/views/wco_hosting/docker-compose/dc-wordpress.erb

@@ -0,0 +1,16 @@
+version: '3.2'
+
+services:
+
+  <%= @app.service_name %>:
+    image: <%= @app.tmpl.image %>
+    volumes:
+      - type: bind
+        source: volumes/<%= @app.service_name %>_data
+        target: /var/www/html
+    ports:
+      - <%= @app.port %>:80
+    restart: always
+
+
+

data/app/views/wco_hosting/scripts/create_subdomain.json.erb

@@ -0,0 +1,16 @@
+
+
+{
+  "Comment": "optional",
+  "Changes": [
+    {
+      "Action": "CREATE",
+      "ResourceRecordSet": {
+        "Name": "<%= @app.origin %>",
+        "Type": "A",
+        "TTL": 3600,
+        "ResourceRecords": [{ "Value": "<%= @app.serverhost.public_ip %>" }]
+      }
+    }
+  ]
+}

data/app/views/wco_hosting/scripts/create_volume.erb

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -ex
+
+cd <%= @workdir %>
+rm -rf __MACOSX
+
+## cache/overwrite
+[ ! -e <%= @app.kind %>__prototype.zip ] && curl <%= @app.tmpl.volume_zip %> > <%= @app.kind %>__prototype.zip
+#                                           curl <%= @app.tmpl.volume_zip %> > <%= @app.kind %>__prototype.zip
+
+## cache/overwrite
+[ ! -e <%= @app.kind %>__prototype     ] && rm -rf <%= @app.kind %>__prototype && unzip <%= @app.kind %>__prototype.zip
+#                                           rm -rf <%= @app.kind %>__prototype && unzip <%= @app.kind %>__prototype.zip
+
+mv  <%= @app.kind %>__prototype ./volumes/<%= @app.service_name %>_data
+
+set +ex
+echo ok #create_volume
+
+

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

@@ -0,0 +1,10 @@
+
+server {
+  listen 443 ssl;
+  server_name <%= @app.host %> ;
+  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
+}

data/lib/ish_models.rb

@@ -8,22 +8,22 @@ module Wco; end
 module WcoEmail; end
 module WcoHosting; end
 
-require 'wco/lead'
-require 'wco/leadset'
-require 'wco/office_action'
-require 'wco/profile'
-require 'wco/tag'
-
-require 'wco_email/campaign'
-require 'wco_email/context'
-require 'wco_email/conversation'
-require 'wco_email/email_filter'
-require 'wco_email/message_template'
-require 'wco_email/scheduled_email_action'
-
-require 'wco_hosting/appliance'
-require 'wco_hosting/appliance_tmpl'
-require 'wco_hosting/domain'
-require 'wco_hosting/serverhost'
+# require 'wco/lead'
+# require 'wco/leadset'
+# require 'wco/office_action'
+# require 'wco/profile'
+# require 'wco/tag'
+
+# require 'wco_email/campaign'
+# require 'wco_email/context'
+# require 'wco_email/conversation'
+# require 'wco_email/email_filter'
+# require 'wco_email/message_template'
+# require 'wco_email/scheduled_email_action'
+
+# require 'wco_hosting/appliance'
+# require 'wco_hosting/appliance_tmpl'
+# require 'wco_hosting/domain'
+# require 'wco_hosting/serverhost'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.15
+  version: 3.1.0.17
 platform: ruby
 authors:
 - mac_a2141
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.txt
 - Rakefile
 - app/assets/config/ish_models_manifest.js
 - app/assets/stylesheets/ish_models/application.css
@@ -136,28 +137,34 @@ files:
 - app/helpers/ish_models/application_helper.rb
 - app/jobs/ish_models/application_job.rb
 - app/mailers/ish_models/application_mailer.rb
-- app/models/ish_models/application_record.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/profile.rb
+- app/models/wco/tag.rb
+- app/models/wco_email/campaign.rb
+- app/models/wco_email/context.rb
+- app/models/wco_email/conversation.rb
+- app/models/wco_email/email_filter.rb
+- app/models/wco_email/message_template.rb
+- app/models/wco_email/scheduled_email_action.rb
+- app/models/wco_email/tag.rb-trash
+- app/models/wco_hosting/appliance.rb
+- app/models/wco_hosting/appliance_tmpl.rb
+- app/models/wco_hosting/domain.rb
+- app/models/wco_hosting/serverhost.rb
 - app/views/layouts/ish_models/application.html.erb
+- app/views/wco_hosting/docker-compose/dc-any.erb
+- app/views/wco_hosting/docker-compose/dc-helloworld.erb
+- app/views/wco_hosting/docker-compose/dc-wordpress.erb
+- app/views/wco_hosting/scripts/create_subdomain.json.erb
+- app/views/wco_hosting/scripts/create_volume.erb
+- app/views/wco_hosting/scripts/nginx_site.conf.erb
 - config/routes.rb
 - lib/ish_models.rb
 - lib/ish_models/engine.rb
 - lib/tasks/ish_models_tasks.rake
-- lib/wco/lead.rb
-- lib/wco/leadset.rb
-- lib/wco/office_action.rb
-- lib/wco/profile.rb
-- lib/wco/tag.rb
-- lib/wco_email/campaign.rb
-- lib/wco_email/context.rb
-- lib/wco_email/conversation.rb
-- lib/wco_email/email_filter.rb
-- lib/wco_email/message_template.rb
-- lib/wco_email/scheduled_email_action.rb
-- lib/wco_email/tag.rb-trash
-- lib/wco_hosting/appliance.rb
-- lib/wco_hosting/appliance_tmpl.rb
-- lib/wco_hosting/domain.rb
-- lib/wco_hosting/serverhost.rb
 homepage: https://wasya.co
 licenses:
 - MIT

data/app/models/ish_models/application_record.rb

@@ -1,5 +0,0 @@
-module IshModels
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end