avm-tools 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243acbdeb6bf47023be05c689219226cb43d7d688b660f4239d3371ef0c8f77d
-  data.tar.gz: 60bf3e35ee6372cfaff53f9e37851087575ffee5906078307e6e73bfbf2e3b69
+  metadata.gz: 8706b02e9000a68816108236851b8d1d80f23c4e4459e080512465c5380bdd75
+  data.tar.gz: 663eb3ef35a98308fcecb64f6a1158165b83f69ffcfeea8a37d15d1710b27bae
 SHA512:
-  metadata.gz: 38b11f783aab60e1d7008fe0925c8782f1e2833d9e071d93bdc322b3a475863e47b57e308650febf5dcb06c095402d43d345d31f6d8b0032ed1751d638ca13c0
-  data.tar.gz: bd3f4ec62f6e1b30559a309d8cd44c6ceb565aa4e7413be3b85d0ff4251927977884259f8cec8d51b0f7de56a4566f8f851b42f3a83f4b5a489ea36fdeaec498
+  metadata.gz: 0ea0def902b2667c4dcb99be2221c917d12ac0acbe534035fe1d296afd4ad4f90ba1a722a1a1e2759b34a2b69791c54615623279813fe410acf2f748fb806b46
+  data.tar.gz: dac7b5102c6624d928f18003e3b745b7fbd89aad73e8b721eedbb08470486f0b4724479cc2d74eaa46e507ee6cd0c17da32c0a38df6afeeb21dcc11667347a8b

data/lib/avm/instances/base/auto_values.rb

@@ -10,7 +10,7 @@ module Avm
         extend ::ActiveSupport::Concern
 
         included do
-          %w[Access Admin Database Filesystem Source Web].each do |class_name|
+          %w[Access Admin Database Filesystem Source System Web].each do |class_name|
             include const_get(class_name)
           end
         end

data/lib/avm/instances/base/auto_values/database.rb

@@ -15,7 +15,7 @@ module Avm
           DEFAULT_SYSTEM = 'postgresql'
 
           def auto_database_name
-            inherited_entry_value(:database_id, 'database.name') || id
+            inherited_entry_value(:'database.id', 'database.name') || id
           end
 
           def auto_database_hostname
@@ -41,7 +41,7 @@ module Avm
           private
 
           def database_auto_common(suffix)
-            inherited_entry_value(:database_id, "database.#{suffix}") ||
+            inherited_entry_value('database.id', "database.#{suffix}") ||
               inherited_entry_value(:host_id, "database.#{suffix}")
           end
 

data/lib/avm/instances/base/auto_values/system.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'addressable'
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module System
+          def auto_system_username
+            inherited_entry_value(:host_id, 'system.username') ||
+              read_entry_optional('ssh.username')
+          end
+
+          def auto_system_groupname
+            inherited_entry_value(:host_id, 'system.groupname') ||
+              read_entry_optional('system.username')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_rails_base0/apache_host.rb

@@ -1,80 +1,17 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-require 'avm/stereotypes/eac_ubuntu_base0/apache'
-require 'avm/templates/file'
+require 'avm/stereotypes/eac_webapp_base0/apache_host'
 
 module Avm
   module Stereotypes
     module EacRailsBase0
-      class ApacheHost
-        enable_console_speaker
-        enable_simple_cache
-        common_constructor :instance
-
-        def run
-          write_available_no_ssl_site
-          enable_no_ssl_site
-          remove_ssl_site
-          reload_apache
-          run_certbot
-          enable_ssl_site
-          reload_apache
-          ::Avm::Result.success('Done')
-        end
-
-        private
-
-        def apache_uncached
-          ::Avm::Stereotypes::EacUbuntuBase0::Apache.new(instance.host_env)
-        end
-
-        def enable_no_ssl_site
-          infom 'Enabling no SSL site...'
-          no_ssl_site.enable
-        end
-
-        def enable_ssl_site
-          infom 'Enabling SSL site...'
-          ssl_site.enable
-        end
-
-        def no_ssl_site_content
-          ::Avm::Templates::File.new(
-            ::File.join(template_path, 'no_ssl.conf')
-          ).apply(instance)
-        end
-
-        def no_ssl_site_uncached
-          apache.site(instance.id)
-        end
-
-        def reload_apache
-          infom 'Reloading Apache...'
-          apache.service('reload')
-        end
-
-        def remove_ssl_site
-          infom 'Removing SSL site...'
-          ssl_site.remove
-        end
-
-        def run_certbot
-          infom 'Running Certbot...'
-          instance.host_env.command(
-            'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
-            '--redirect', '--non-interactive', '--agree-tos',
-            '--email', instance.read_entry('admin.email')
-          ).system!
-        end
-
-        def ssl_site_uncached
-          apache.site(no_ssl_site.name + '-le-ssl')
+      class ApacheHost < ::Avm::Stereotypes::EacWebappBase0::ApacheHost
+        def document_root
+          "#{instance.read_entry(:fs_path)}/public"
         end
 
-        def write_available_no_ssl_site
-          infom 'Writing no SSL site conf...'
-          no_ssl_site.write(no_ssl_site_content)
+        def extra_content
+          'PassengerEnabled On'
         end
       end
     end

data/lib/avm/stereotypes/eac_webapp_base0/apache_host.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/patches/object/template'
+require 'avm/stereotypes/eac_ubuntu_base0/apache'
+require 'avm/templates/file'
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      class ApacheHost
+        enable_console_speaker
+        enable_simple_cache
+        common_constructor :instance
+
+        def run
+          write_available_no_ssl_site
+          enable_no_ssl_site
+          remove_ssl_site
+          reload_apache
+          run_certbot
+          enable_ssl_site
+          reload_apache
+          ::Avm::Result.success('Done')
+        end
+
+        def no_ssl_site_content
+          ::Avm::Templates::File.new(
+            ::File.join(::Avm::Stereotypes::EacWebappBase0::ApacheHost.template_path, 'no_ssl.conf')
+          ).apply(EntriesReader.new(self, instance))
+        end
+
+        private
+
+        def apache_uncached
+          ::Avm::Stereotypes::EacUbuntuBase0::Apache.new(instance.host_env)
+        end
+
+        def enable_no_ssl_site
+          infom 'Enabling no SSL site...'
+          no_ssl_site.enable
+        end
+
+        def enable_ssl_site
+          infom 'Enabling SSL site...'
+          ssl_site.enable
+        end
+
+        def no_ssl_site_uncached
+          apache.site(instance.id)
+        end
+
+        def reload_apache
+          infom 'Reloading Apache...'
+          apache.service('reload')
+        end
+
+        def remove_ssl_site
+          infom 'Removing SSL site...'
+          ssl_site.remove
+        end
+
+        def run_certbot
+          infom 'Running Certbot...'
+          instance.host_env.command(
+            'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
+            '--redirect', '--non-interactive', '--agree-tos',
+            '--email', instance.read_entry('admin.email')
+          ).system!
+        end
+
+        def ssl_site_uncached
+          apache.site(no_ssl_site.name + '-le-ssl')
+        end
+
+        def write_available_no_ssl_site
+          infom 'Writing no SSL site conf...'
+          no_ssl_site.write(no_ssl_site_content)
+        end
+
+        class EntriesReader
+          common_constructor :job, :instance
+
+          def read_entry(path, options = {})
+            entry_from_job(path) || instance.read_entry(path, options)
+          end
+
+          private
+
+          def entry_from_job(path)
+            method = path.gsub('.', '_').underscore
+            return job.send(method) if job.respond_to?(method, true)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/stereotypes/eac_webapp_base0/apache_host'
+
+module Avm
+  module Stereotypes
+    module EacWordpressBase0
+      class ApacheHost < ::Avm::Stereotypes::EacWebappBase0::ApacheHost
+        def document_root
+          instance.read_entry(:fs_path)
+        end
+
+        def extra_content
+          "AssignUserID #{system_user} #{system_group}"
+        end
+
+        def system_user
+          instance.read_entry('system.username')
+        end
+
+        def system_group
+          instance.read_entry('system.groupname')
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_rails_base0/apache_host.rb

@@ -20,7 +20,6 @@ module Avm
 
             Options:
               -h --help                       Show this screen.
-              -r --reference=<git-reference>  Git reference to deploy.
           DOCOPT
 
           def run

data/lib/avm/tools/runner/eac_wordpress_base0.rb

@@ -3,6 +3,7 @@
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/stereotypes/eac_wordpress_base0/instance'
+require 'avm/tools/runner/eac_wordpress_base0/apache_host'
 require 'avm/tools/runner/eac_wordpress_base0/data'
 require 'avm/tools/runner/eac_wordpress_base0/deploy'
 

data/lib/avm/tools/runner/eac_wordpress_base0/apache_host.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/console/speaker'
+require 'avm/stereotypes/eac_wordpress_base0/apache_host'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class ApacheHost < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacRubyUtils::Console::Speaker
+
+          DOC = <<~DOCOPT
+            Configure Apache virtual host for EacWordpressBase0 instance.
+
+            Usage:
+              __PROGRAM__ [options]
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help                       Show this screen.
+          DOCOPT
+
+          def run
+            result = ::Avm::Stereotypes::EacWordpressBase0::ApacheHost.new(
+              context(:instance)
+            ).run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.20.0'
+    VERSION = '0.21.0'
   end
 end

data/template/avm/stereotypes/{eac_rails_base0 → eac_webapp_base0}/apache_host/no_ssl.conf

@@ -1,9 +1,9 @@
 <VirtualHost *:80>
   ServerName "%%WEB.HOSTNAME%%"
-  DocumentRoot "%%FS_PATH%%/public"
-  PassengerEnabled On
+  DocumentRoot "%%DOCUMENT_ROOT%%"
+  %%EXTRA_CONTENT%%
 
-  <Directory "%%FS_PATH%%/public">
+  <Directory "%%DOCUMENT_ROOT%%">
     Allow from all
     Options -MultiViews
     Require all granted

data/template/avm/stereotypes/eac_wordpress_base0/deploy/wp-config.php.template

@@ -20,13 +20,13 @@
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define( 'DB_NAME', '%%DATABASE_NAME%%' );
+define( 'DB_NAME', '%%DATABASE.NAME%%' );
 
 /** MySQL database username */
-define( 'DB_USER', '%%DATABASE_USER%%' );
+define( 'DB_USER', '%%DATABASE.USER%%' );
 
 /** MySQL database password */
-define( 'DB_PASSWORD', '%%DATABASE_PASSWORD%%' );
+define( 'DB_PASSWORD', '%%DATABASE.PASSWORD%%' );
 
 /** MySQL hostname */
 define( 'DB_HOST', 'localhost' );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -208,6 +208,7 @@ files:
 - lib/avm/instances/base/auto_values/database.rb
 - lib/avm/instances/base/auto_values/filesystem.rb
 - lib/avm/instances/base/auto_values/source.rb
+- lib/avm/instances/base/auto_values/system.rb
 - lib/avm/instances/base/auto_values/web.rb
 - lib/avm/instances/entries.rb
 - lib/avm/instances/entries/entry_reader.rb
@@ -224,8 +225,10 @@ files:
 - lib/avm/stereotypes/eac_ubuntu_base0/apache.rb
 - lib/avm/stereotypes/eac_ubuntu_base0/apache/site.rb
 - lib/avm/stereotypes/eac_webapp_base0.rb
+- lib/avm/stereotypes/eac_webapp_base0/apache_host.rb
 - lib/avm/stereotypes/eac_webapp_base0/deploy.rb
 - lib/avm/stereotypes/eac_webapp_base0/instance.rb
+- lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb
 - lib/avm/stereotypes/eac_wordpress_base0/deploy.rb
 - lib/avm/stereotypes/eac_wordpress_base0/instance.rb
 - lib/avm/stereotypes/postgresql.rb
@@ -242,6 +245,7 @@ files:
 - lib/avm/tools/runner/eac_rails_base0/apache_host.rb
 - lib/avm/tools/runner/eac_rails_base0/deploy.rb
 - lib/avm/tools/runner/eac_wordpress_base0.rb
+- lib/avm/tools/runner/eac_wordpress_base0/apache_host.rb
 - lib/avm/tools/runner/eac_wordpress_base0/data.rb
 - lib/avm/tools/runner/eac_wordpress_base0/data/dump.rb
 - lib/avm/tools/runner/eac_wordpress_base0/data/load.rb
@@ -256,8 +260,8 @@ files:
 - lib/avm/tools/runner/git/issue.rb
 - lib/avm/tools/runner/git/issue/complete.rb
 - lib/avm/tools/version.rb
-- template/avm/stereotypes/eac_rails_base0/apache_host/no_ssl.conf
 - template/avm/stereotypes/eac_rails_base0/deploy/config/database.yml.template
+- template/avm/stereotypes/eac_webapp_base0/apache_host/no_ssl.conf
 - template/avm/stereotypes/eac_wordpress_base0/deploy/wp-config.php.template
 homepage: 
 licenses: []