wco_models 3.1.0.147 → 3.1.0.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dda9cec9a14631ff34abd28542db031215e9431ebe422329e1f3c8a6fb295ea
-  data.tar.gz: 0fa1061f925315c0894b17e73ea1fbdde9e588cc6d1094c9ad4c94f04b8f1b34
+  metadata.gz: 4ee4313ebc6b594dd44a3b5393ccf9495fb2e475c42c5677e1bf285361b81f89
+  data.tar.gz: f6cf48e41de6a37250064ffff72f78db0e9d142651d54aefafbcff18dcd0bc53
 SHA512:
-  metadata.gz: b25ec1622c39432e74881462374afcfb21822a3d686bef81eaf32fa3afec23bb52eac3a2daa58cf09c66ef26c1bed0760e5ddc93264c59b1745605bc1d84d995
-  data.tar.gz: c2ae2e54509129cfcd18f56762bfb53861d55c4d6030f721a7739d1979a6324ec3fbfe3ec76ecb1984e94ff30ea0cacbf94a05292dd030178e7aec41aa416c61
+  metadata.gz: c962c417116006e454cf1a3001027592af407c37f8368189db155678f2bdc3ef588eeb7fe4af9c140a760299d22a2080132b0db441a08446e6839a43aa749ceb
+  data.tar.gz: 5ae5fff70b299b0b8cee57b8c16997580a8a98989dba824a2129629ec18a10b59e3bd67c265bc6ad5174edccdc1811bde790068f3f2b015d8f44fb67b67fd6b7

data/app/controllers/wco/leads_controller.rb

@@ -26,10 +26,14 @@ class Wco::LeadsController < Wco::ApplicationController
     authorize! :index, Wco::Lead
     @leads = Wco::Lead.all
 
+
+
     if params[:q].present?
+      q = params[:q].downcase
       @leads = @leads.any_of(
-        { email: /#{params[:q].downcase}/i },
-        { name:  /#{params[:q].downcase}/i } )
+        { email: /#{q}/i },
+        { name:  /#{q}/i },
+      );
 
       if 1 == @leads.length
         redirect_to controller: 'wco/leads', action: 'show', id: @leads[0].id

data/app/controllers/wco/profiles_controller.rb

@@ -1,6 +1,16 @@
 
 class Wco::ProfilesController < Wco::ApplicationController
 
+  def edit
+    @profile = Wco::Profile.find params[:id]
+    authorize! :update, @profile
+  end
+
+  def index
+    @profiles = Wco::Profile.all
+    authorize! :index, Wco::Profile
+  end
+
   def update
     @profile = Wco::Profile.find params[:id]
     authorize! :update, @profile

data/app/controllers/wco/tags_controller.rb

@@ -1,7 +1,7 @@
 
 class Wco::TagsController < Wco::ApplicationController
 
-  before_action :set_lists, only: %i| show |
+  before_action :set_lists
 
   def create
     @tag = Wco::Tag.new params[:tag].permit!
@@ -37,7 +37,6 @@ class Wco::TagsController < Wco::ApplicationController
 
   def new
     authorize! :new, Wco::Tag
-    @new_tag = Wco::Tag.new
   end
 
   def add_to
@@ -91,7 +90,9 @@ class Wco::TagsController < Wco::ApplicationController
   private
 
   def set_lists
+    @new_tag = Wco::Tag.new
     @tags = Wco::Tag.all.order_by( slug: :asc )
+    @tags_list = Wco::Tag.list
   end
 
 

data/app/models/wco/profile.rb

@@ -16,6 +16,13 @@ class Wco::Profile
   has_many :newsitems, class_name: 'Wco::Newsitem'
   has_and_belongs_to_many :shared_galleries, class_name: 'Wco::Gallery', inverse_of: :shared_profiles
 
+  ROLE_ADMIN = 'admin'
+  ROLE_GUY   = 'guy'
+  ROLES      = [ ROLE_ADMIN, ROLE_GUY ]
+  field :role, type: :string, default: ROLE_GUY
+  def self.roles_list
+    [nil] + ROLES
+  end
 
   def to_s
     email

data/app/models/wco/tag.rb

@@ -9,7 +9,8 @@ class Wco::Tag
   validates :slug, presence: true, uniqueness: true
   index({ slug: -1 })
 
-  # parent-child
+  belongs_to :parent, class_name: 'Wco::Tag', inverse_of: :sons
+  has_many :sons, class_name: 'Wco::Tag', inverse_of: :parent
 
   has_many :email_filters, class_name: 'WcoEmail::EmailFilter', inverse_of: :tag
 

data/app/models/wco_hosting/appliance.rb

@@ -16,7 +16,11 @@ class WcoHosting::Appliance
     self[:service_name] = host.gsub(".", "_")
   end
 
+
   belongs_to :environment, class_name: 'WcoHosting::Environment', inverse_of: :appliances, optional: true
+  def environment_name
+    environment&.name
+  end
 
   field :subdomain
   field :domain
@@ -34,13 +38,13 @@ class WcoHosting::Appliance
     tmpl.kind
   end
 
-  belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost'
+  belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost', optional: true
 
   field :port
 
-  STATE_PENDING = 'state-pending'
-  STATE_LIVE    = 'state-live'
-  STATE_TERM    = 'state-term'
+  STATE_PENDING    = 'pending'
+  STATE_LIVE       = 'live'
+  STATE_TERMINATED = 'terminated'
   field :state, default: STATE_PENDING
 
   def to_s

data/app/models/wco_hosting/appliance_tmpl.rb

@@ -18,11 +18,31 @@ class WcoHosting::ApplianceTmpl
   end
   field :descr, type: :string
 
-  field :image
-  validates :image, presence: true
+  field :ecs_task_definition_erb, type: :string
+  # def ecs_task_definition
+  #   ac   = ActionController::Base.new
+  #   ac.instance_variable_set( :@tmpl, self )
+  #   rendered_str = ac.render_to_string("wco_hosting/scripts/nginx_site.conf")
+  #   Wco::Log.puts! rendered_str, 'add_nginx_site rendered_str', obj: @obj
+
+  #   file = Tempfile.new('prefix')
+  #   file.write rendered_str
+  #   file.close
+  # end
+
 
-  field :volume_zip
-  validates :volume_zip, presence: true
+  field :image
+  # validates :image, presence: true
+
+  field :volume_zip_url
+  field :volume_zip_exe
+  def volume_zip
+    if volume_zip_exe
+      eval( volume_zip_exe )
+    else
+      volume_zip_url
+    end
+  end
 
   ## 2023-12-08 :: These names are impossible to change already.
   KIND_CRM        = 'crm'

data/app/models/wco_hosting/environment.rb

@@ -13,6 +13,9 @@ class WcoHosting::Environment
 
   has_many :appliances, class_name: 'WcoHosting::Appliance', inverse_of: :environments
 
+  ## variable @env in execution environments
+  field :env_json, type: Object, default: '{}'
+
   def to_s
     name
   end

data/app/models/wco_hosting/runner.rb

@@ -0,0 +1,26 @@
+
+require 'net/scp'
+require 'open3'
+require 'droplet_kit'
+
+class WcoHosting::Runner
+
+  def self.create_ecs_task
+  end
+
+  TASK_REDEPLOY_ECS_TASK_DEFINITION = 'redeploy-ecs-task-definition'
+  TASK_REDEPLOY_ECS_TASK            = 'redeploy-ecs-task'
+  TASKS = []
+
+  def self.do_exec cmd
+    Wco::Log.puts! cmd, '#do_exec', obj: @obj
+
+    stdout, stderr, status = Open3.capture3(cmd)
+    status = status.to_s.split.last.to_i
+    Wco::Log.puts! stdout, 'stdout', obj: @obj
+    Wco::Log.puts! stderr, 'stderr', obj: @obj
+    Wco::Log.puts! status, 'status', obj: @obj
+    return { stdout: stdout, stderr: stderr, status: status }
+  end
+
+end

data/app/models/wco_hosting/task.rb

@@ -0,0 +1,8 @@
+
+class WcoHosting::Task
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_tasks'
+
+end

data/app/models/wco_hosting/task_tmpl.rb

@@ -0,0 +1,11 @@
+
+class WcoHosting::TaskTmpl
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_task_tmpls'
+
+  field :slug
+  validates :slug, presence: true
+
+end

data/app/views/wco/_main_header.haml

@@ -28,6 +28,7 @@
         %li= render '/wco/leads/header'
         %li= render '/wco/office_action_templates/header'
         %li= render '/wco/office_actions/header'
+        %li= render '/wco/profiles/header'
 
       %ul
         %li= render '/wco/sites/header'

data/app/views/wco/profiles/_form.haml

@@ -0,0 +1,9 @@
+
+.profiles--form
+  = form_for profile do |f|
+    .field
+      %label role
+      = f.select :role, options_for_select(Wco::Profile.roles_list, selected: profile.role )
+
+    .actions
+      = f.submit 'Go'

data/app/views/wco/profiles/_header.haml

@@ -0,0 +1,6 @@
+
+= link_to "Profiles (#{Wco::Profile.all.length})", wco.profiles_path
+.inline-search
+  = form_tag wco.profiles_path, method: :get do
+    = text_field_tag :q
+= link_to '[+]', wco.new_profile_path

data/app/views/wco/profiles/edit.haml

@@ -0,0 +1,6 @@
+
+.profiles-edit.maxwidth
+  .header
+    .title edit profile
+
+  = render 'form', profile: @profile

data/app/views/wco/profiles/index.haml

@@ -0,0 +1,10 @@
+
+.profiles-index.maxwidth
+  .header
+    .title Profiles
+
+  %ul
+    - @profiles.each do |profile|
+      %li
+        = link_to '[~]', edit_profile_path(profile)
+        = profile.email

data/app/views/wco/tags/_form.haml

@@ -6,5 +6,9 @@
       %label slug
       = f.text_field :slug
 
+    .field.d-flex
+      %label parent
+      = f.select :parent_id, options_for_select(@tags_list, selected: tag.parent_id ), {}, class: 'select2'
+
     .actions
       = f.submit

data/app/views/wco/tags/edit.haml

@@ -1,4 +1,6 @@
 
 .tags-edit.maxwidth
+  .header
+    %h5.title Edit tag `#{@tag}`
 
   = render 'form', tag: @tag

data/app/views/wco/tags/index.haml

@@ -6,4 +6,9 @@
   = render 'index', tags: @tags
 
   %hr
-  = render 'form', tag: Wco::Tag.new
+
+  .tags-new.maxwidth
+    .header
+      %h5.title New tag
+
+    = render 'form', tag: @new_tag

data/app/views/wco/tags/new.haml

@@ -0,0 +1,6 @@
+
+.tags-new.maxwidth
+  .header
+    %h5.title New tag
+
+  = render 'form', tag: @new_tag

data/app/views/wco_hosting/ecs_task_definitions/demmitv.json

@@ -0,0 +1,40 @@
+
+{
+  "family": "demmitv_drupal",
+  "networkMode": "awsvpc",
+  "taskRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "executionRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "containerDefinitions": [
+      {
+          "name": "demmitv_drupal_ecs1",
+          "image": "piousbox/php81:0.0.2",
+          "portMappings": [
+              {
+                  "containerPort": 80,
+                  "hostPort": 80,
+                  "protocol": "tcp"
+              }
+          ],
+          "logConfiguration": {
+            "logDriver": "awslogs",
+            "options": {
+              "awslogs-create-group": "true",
+              "awslogs-group": "drupal-1",
+              "awslogs-region": "us-east-2",
+              "awslogs-stream-prefix": "wco-"
+            }
+          },
+          "essential": true,
+          "entryPoint": [
+            "sh",
+            "-c"
+          ],
+          "command": [
+              "/bin/sh -c \"cd /var/www/html && curl -u abba:simplerpassword https://secrets.wasya.co/demmitv_drupal_ecs1.zip --output demmitv_drupal_ecs1-0.0.0.zip && unzip -o demmitv_drupal_ecs1-0.0.0.zip && cd web && apachectl -D FOREGROUND \" "
+          ]
+      }
+  ],
+  "requiresCompatibilities": [ "FARGATE" ],
+  "cpu": "256",
+  "memory": "512"
+  }

data/app/views/wco_hosting/ecs_task_definitions/drupal.json-template

@@ -0,0 +1,40 @@
+
+{
+  "family": "drupal",
+  "networkMode": "awsvpc",
+  "taskRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "executionRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "containerDefinitions": [
+      {
+          "name": "<%= @app.kind %>_drupal_<%= @app.environment_name %>",
+          "image": "piousbox/php81:0.0.2",
+          "portMappings": [
+              {
+                  "containerPort": 80,
+                  "hostPort": 80,
+                  "protocol": "tcp"
+              }
+          ],
+          "logConfiguration": {
+            "logDriver": "awslogs",
+            "options": {
+              "awslogs-create-group": "true",
+              "awslogs-group": "drupal-1",
+              "awslogs-region": "us-east-2",
+              "awslogs-stream-prefix": "wco-"
+            }
+          },
+          "essential": true,
+          "entryPoint": [
+            "sh",
+            "-c"
+          ],
+          "command": [
+              "/bin/sh -c \"cd /var/www/html && curl -u abba:simplerpassword https://secrets.wasya.co/<%= @app.kind %>_drupal_<%= @app.environment_name %>-<%= @app.version %>.zip && unzip <%= @app.kind %>_drupal_<%= @app.environment_name %>-<%= @app.version %>.zip && composer install && apachectl -D FOREGROUND \" "
+          ]
+      }
+  ],
+  "requiresCompatibilities": [ "FARGATE" ],
+  "cpu": "256",
+  "memory": "512"
+  }

data/app/views/wco_hosting/ecs_task_definitions/example1.json

@@ -0,0 +1,41 @@
+{
+  "family": "example",
+  "networkMode": "awsvpc",
+  "taskRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "executionRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "containerDefinitions": [
+    {
+      "name": "example",
+      "image": "public.ecr.aws/docker/library/httpd:latest",
+      "portMappings": [
+        {
+          "containerPort": 80,
+          "hostPort": 80,
+          "protocol": "tcp"
+        }
+      ],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-create-group": "true",
+          "awslogs-group": "awslogs-group-1",
+          "awslogs-region": "us-east-1",
+          "awslogs-stream-prefix": "wco1-"
+        }
+      },
+      "essential": true,
+      "entryPoint": [
+        "sh",
+        "-c"
+      ],
+      "command": [
+        "/bin/sh -c \"echo '<html> <head> <title>Amazon ECS Sample App</title> <style>body {margin-top: 40px; background-color: #333;} </style> </head><body> <div style=color:white;text-align:center> <h1>Amazon ECS Sample App</h1> <h2>Congratulations!</h2> <p>Your application is now running on a container in Amazon ECS.</p> </div></body></html>' >  /usr/local/apache2/htdocs/index.html && httpd-foreground\""
+      ]
+    }
+  ],
+  "requiresCompatibilities": [
+    "FARGATE"
+  ],
+  "cpu": "256",
+  "memory": "512"
+}

data/app/views/wco_hosting/ecs_task_definitions/example2.txt-trash

@@ -0,0 +1,54 @@
+{
+    "containerDefinitions": [
+        {
+            "name": "wordpress",
+            "links": [
+                "mysql"
+            ],
+            "image": "wordpress",
+            "essential": true,
+            "portMappings": [
+                {
+                    "containerPort": 80,
+                    "hostPort": 80
+                }
+            ],
+            "logConfiguration": {
+                "logDriver": "awslogs",
+                "options": {
+                    "awslogs-create-group": "true",
+                    "awslogs-group": "awslogs-wordpress",
+                    "awslogs-region": "us-west-2",
+                    "awslogs-stream-prefix": "awslogs-example"
+                }
+            },
+            "memory": 500,
+            "cpu": 10
+        },
+        {
+            "environment": [
+                {
+                    "name": "MYSQL_ROOT_PASSWORD",
+                    "value": "password"
+                }
+            ],
+            "name": "mysql",
+            "image": "mysql",
+            "cpu": 10,
+            "memory": 500,
+            "essential": true,
+            "logConfiguration": {
+                "logDriver": "awslogs",
+                "options": {
+                    "awslogs-create-group": "true",
+                    "awslogs-group": "awslogs-mysql",
+                    "awslogs-region": "us-west-2",
+                    "awslogs-stream-prefix": "awslogs-example",
+                    "mode": "non-blocking",
+                    "max-buffer-size": "25m"
+                }
+            }
+        }
+    ],
+    "family": "awslogs-example"
+}

data/app/views/wco_hosting/ecs_task_definitions/hw1.json

@@ -0,0 +1,40 @@
+
+{
+  "family": "helloworld",
+  "networkMode": "awsvpc",
+  "taskRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "executionRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "containerDefinitions": [
+      {
+          "name": "helloworld",
+          "image": "piousbox/php82:0.0.2",
+          "portMappings": [
+              {
+                  "containerPort": 80,
+                  "hostPort": 80,
+                  "protocol": "tcp"
+              }
+          ],
+          "logConfiguration": {
+            "logDriver": "awslogs",
+            "options": {
+              "awslogs-create-group": "true",
+              "awslogs-group": "awslogs-group-1",
+              "awslogs-region": "us-east-1",
+              "awslogs-stream-prefix": "wco1-"
+            }
+          },
+          "essential": true,
+          "entryPoint": [
+            "sh",
+            "-c"
+          ],
+          "command": [
+              "/bin/sh -c \"cd /var/www/html && wget https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2024/03/28014630/helloworld-0.0.1.zip && unzip helloworld-0.0.1.zip && apachectl -D FOREGROUND \" "
+          ]
+      }
+  ],
+  "requiresCompatibilities": [ "FARGATE" ],
+  "cpu": "256",
+  "memory": "512"
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.147
+  version: 3.1.0.149
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -475,8 +475,11 @@ files:
 - app/models/wco_hosting/appliance_tmpl.rb
 - app/models/wco_hosting/domain.rb
 - app/models/wco_hosting/environment.rb
+- app/models/wco_hosting/runner.rb
 - app/models/wco_hosting/serverhost.rb
 - app/models/wco_hosting/subdomain.rb
+- app/models/wco_hosting/task.rb
+- app/models/wco_hosting/task_tmpl.rb
 - app/views/layouts/wco/application.haml
 - app/views/wco/_alerts_notices.haml
 - app/views/wco/_analytics.erb
@@ -574,7 +577,11 @@ files:
 - app/views/wco/products/new.haml
 - app/views/wco/products/show.haml
 - app/views/wco/products/show.jbuilder
+- app/views/wco/profiles/_form.haml
 - app/views/wco/profiles/_form_extra.haml
+- app/views/wco/profiles/_header.haml
+- app/views/wco/profiles/edit.haml
+- app/views/wco/profiles/index.haml
 - app/views/wco/publishers/_form.haml
 - app/views/wco/publishers/_header.haml
 - app/views/wco/publishers/edit.haml
@@ -638,9 +645,15 @@ files:
 - app/views/wco_email/email_layouts/_test_tracking_footer.haml
 - app/views/wco_email/email_layouts/_wasyaco_roundborders.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-react.erb
-- app/views/wco_hosting/docker-compose/dc-wordpress.erb
+- app/views/wco_hosting/docker-compose/trash/dc-helloworld.erb
+- app/views/wco_hosting/docker-compose/trash/dc-react.erb
+- app/views/wco_hosting/docker-compose/trash/dc-wordpress.erb
+- app/views/wco_hosting/ecs_task_definitions/demmitv.json
+- app/views/wco_hosting/ecs_task_definitions/demmitv_drupal_ecs1-0.0.0.zip
+- app/views/wco_hosting/ecs_task_definitions/drupal.json-template
+- app/views/wco_hosting/ecs_task_definitions/example1.json
+- app/views/wco_hosting/ecs_task_definitions/example2.txt-trash
+- app/views/wco_hosting/ecs_task_definitions/hw1.json
 - app/views/wco_hosting/scripts/create_volume.erb
 - app/views/wco_hosting/scripts/nginx_site.conf.erb
 - config/initializers/assets.rb