smartcloud 0.6.0 → 0.7.0

data/lib/{smartcloud → smart_cloud}/engine.rb

@@ -1,29 +1,29 @@
-# The main Smartcloud Engine driver
-module Smartcloud
-	class Engine < Smartcloud::Base
+# The main SmartCloud Engine driver
+module SmartCloud
+	class Engine < SmartCloud::Base
 		def initialize
 		end
 
 		def install
 			self.uninstall
 
-			Smartcloud::User.create_htpasswd_files
+			SmartCloud::User.create_htpasswd_files
 
-			ssh = Smartcloud::SSH.new
-			machine = Smartcloud::Machine.new
+			ssh = SmartCloud::SSH.new
+			machine = SmartCloud::Machine.new
 
 			system("mkdir -p ./tmp/engine")
-			system("cp #{Smartcloud.config.root_path}/lib/smartcloud/engine/Dockerfile ./tmp/engine/Dockerfile")
+			system("cp #{SmartCloud.config.root_path}/lib/smartcloud/engine/Dockerfile ./tmp/engine/Dockerfile")
 
-			gem_file_path = File.expand_path("../../cache/smartcloud-#{Smartcloud.version}.gem", Smartcloud.config.root_path)
-			system("cp #{gem_file_path} ./tmp/engine/smartcloud-#{Smartcloud.version}.gem")
+			gem_file_path = File.expand_path("../../cache/smartcloud-#{SmartCloud.version}.gem", SmartCloud.config.root_path)
+			system("cp #{gem_file_path} ./tmp/engine/smartcloud-#{SmartCloud.version}.gem")
 
 			machine.sync first_sync: true
 
 			puts "-----> Creating image smartcloud ... "
 			ssh.run "docker image build -t smartcloud \
-					--build-arg SMARTCLOUD_MASTER_KEY=#{Smartcloud::Credentials.new.read_key} \
-					--build-arg SMARTCLOUD_VERSION=#{Smartcloud.version} \
+					--build-arg SMARTCLOUD_MASTER_KEY=#{SmartCloud::Credentials.new.read_key} \
+					--build-arg SMARTCLOUD_VERSION=#{SmartCloud.version} \
 					--build-arg USER_NAME=`id -un` \
 					--build-arg USER_UID=`id -u` \
 					--build-arg DOCKER_GID=`getent group docker | cut -d: -f3` \
@@ -32,13 +32,13 @@ module Smartcloud
 			puts "-----> Adding smartcloud to PATH ... "
 			ssh.run "chmod +x ~/.smartcloud/bin/smartcloud.sh && sudo ln -sf ~/.smartcloud/bin/smartcloud.sh /usr/local/bin/smartcloud"
 			system("rm ./tmp/engine/Dockerfile")
-			system("rm ./tmp/engine/smartcloud-#{Smartcloud.version}.gem")
+			system("rm ./tmp/engine/smartcloud-#{SmartCloud.version}.gem")
 
 			machine.sync
 		end
 
 		def uninstall
-			ssh = Smartcloud::SSH.new
+			ssh = SmartCloud::SSH.new
 
 			ssh.run "sudo rm /usr/local/bin/smartcloud"
 			ssh.run "docker rmi smartcloud"

data/lib/{smartcloud → smart_cloud}/engine/Dockerfile

@@ -16,12 +16,12 @@ RUN apk add --update build-base && \
 	apk add --update git && \
     rm -rf /var/cache/apk/*
 
-# Smartcloud Gem
+# smartcloud gem
 ARG SMARTCLOUD_VERSION
 COPY ./smartcloud-$SMARTCLOUD_VERSION.gem ./smartcloud-$SMARTCLOUD_VERSION.gem
 RUN gem install --no-document smartcloud-$SMARTCLOUD_VERSION.gem && \
 	rm ./smartcloud-$SMARTCLOUD_VERSION.gem
 
-# Smartcloud Master Key
+# smartcloud master key
 ARG SMARTCLOUD_MASTER_KEY
 ENV SMARTCLOUD_MASTER_KEY=$SMARTCLOUD_MASTER_KEY

data/lib/smart_cloud/gem_version.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module SmartCloud
+  # Returns the version of the currently loaded SmartCloud as a <tt>Gem::Version</tt>.
+  def self.gem_version
+    Gem::Version.new VERSION::STRING
+  end
+
+  module VERSION
+    MAJOR = 0
+    MINOR = 7
+    TINY  = 0
+    PRE   = nil
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
+end

data/lib/{smartcloud → smart_cloud}/grids/nextcloud.rb

@@ -1,31 +1,31 @@
-# The main Smartcloud Grids Minio driver
-module Smartcloud
-	module Grids
-		class Nextcloud < Smartcloud::Base
+# The main SmartCloud Grids Minio driver
+module SmartCloud
+	class Grids
+		class Nextcloud < SmartCloud::Base
 			def initialize
 			end
 
 			def self.up
-				if Smartcloud::Docker.running?
+				if SmartCloud::Docker.running?
 					# Creating & Starting containers
 					print "-----> Creating container nextcloud ... "
 					if system("docker create \
 						--name='nextcloud' \
-						--env VIRTUAL_HOST=#{Smartcloud.credentials.nextcloud[:hostname]}.#{Smartcloud.config.apps_domain} \
-						--env LETSENCRYPT_HOST=#{Smartcloud.credentials.nextcloud[:hostname]}.#{Smartcloud.config.apps_domain} \
-						--env LETSENCRYPT_EMAIL=#{Smartcloud.config.sysadmin_email} \
+						--env VIRTUAL_HOST=#{SmartCloud.credentials.nextcloud[:name]}.#{SmartCloud.config.apps_domain} \
+						--env LETSENCRYPT_HOST=#{SmartCloud.credentials.nextcloud[:name]}.#{SmartCloud.config.apps_domain} \
+						--env LETSENCRYPT_EMAIL=#{SmartCloud.config.sysadmin_email} \
 						--env LETSENCRYPT_TEST=false \
-						--env NEXTCLOUD_TRUSTED_DOMAINS=#{Smartcloud.credentials.nextcloud[:hostname]}.#{Smartcloud.config.apps_domain} \
+						--env NEXTCLOUD_TRUSTED_DOMAINS=#{SmartCloud.credentials.nextcloud[:name]}.#{SmartCloud.config.apps_domain} \
 						--env NC_overwriteprotocol=https \
-						--env NEXTCLOUD_ADMIN_USER=#{Smartcloud.credentials.nextcloud[:admin_username]} \
-						--env NEXTCLOUD_ADMIN_PASSWORD=#{Smartcloud.credentials.nextcloud[:admin_password]} \
-						--env MYSQL_HOST=#{Smartcloud.credentials.nextcloud[:database_host]}:#{Smartcloud.credentials.nextcloud[:database_port]} \
-						--env MYSQL_USER=#{Smartcloud.credentials.nextcloud[:database_username]} \
-						--env MYSQL_PASSWORD=#{Smartcloud.credentials.nextcloud[:database_password]} \
-						--env MYSQL_DATABASE=#{Smartcloud.credentials.nextcloud[:database_name]} \
+						--env NEXTCLOUD_ADMIN_USER=#{SmartCloud.credentials.nextcloud[:admin_username]} \
+						--env NEXTCLOUD_ADMIN_PASSWORD=#{SmartCloud.credentials.nextcloud[:admin_password]} \
+						--env MYSQL_HOST=#{SmartCloud.credentials.nextcloud[:database_host]}:#{SmartCloud.credentials.nextcloud[:database_port]} \
+						--env MYSQL_USER=#{SmartCloud.credentials.nextcloud[:database_username]} \
+						--env MYSQL_PASSWORD=#{SmartCloud.credentials.nextcloud[:database_password]} \
+						--env MYSQL_DATABASE=#{SmartCloud.credentials.nextcloud[:database_name]} \
 						--user `id -u`:`id -g` \
 						--sysctl net.ipv4.ip_unprivileged_port_start=0 \
-						--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-nextcloud/html:/var/www/html' \
+						--volume='#{SmartCloud.config.user_home_path}/.smartcloud/grids/nextcloud/html:/var/www/html' \
 						--restart='always' \
 						--network='nginx-network' \
 						nextcloud:18.0.2-apache", out: File::NULL)
@@ -42,7 +42,7 @@ module Smartcloud
 			end
 
 			def self.down
-				if Smartcloud::Docker.running?
+				if SmartCloud::Docker.running?
 					# Stopping & Removing containers - in reverse order
 					print "-----> Stopping container nextcloud ... "
 					if system("docker stop 'nextcloud'", out: File::NULL)

data/lib/{smartcloud → smart_cloud}/grids/redmine.rb

@@ -1,29 +1,29 @@
-# The main Smartcloud Grids Redmine driver
-module Smartcloud
-	module Grids
-		class Redmine < Smartcloud::Base
+# The main SmartCloud Grids Redmine driver
+module SmartCloud
+	class Grids
+		class Redmine < SmartCloud::Base
 			def initialize
 			end
 
 			def self.up
-				if Smartcloud::Docker.running?
+				if SmartCloud::Docker.running?
 					# Creating & Starting containers
 					print "-----> Creating container redmine ... "
 					if system("docker create \
 						--name='redmine' \
-						--env VIRTUAL_HOST=redmine.#{Smartcloud.config.apps_domain} \
-						--env LETSENCRYPT_HOST=redmine.#{Smartcloud.config.apps_domain} \
-						--env LETSENCRYPT_EMAIL=#{Smartcloud.config.sysadmin_email} \
+						--env VIRTUAL_HOST=redmine.#{SmartCloud.config.apps_domain} \
+						--env LETSENCRYPT_HOST=redmine.#{SmartCloud.config.apps_domain} \
+						--env LETSENCRYPT_EMAIL=#{SmartCloud.config.sysadmin_email} \
 						--env LETSENCRYPT_TEST=false \
-						--env REDMINE_SECRET_KEY_BASE=#{Smartcloud.credentials.redmine[:secret_key_base]} \
-						--env REDMINE_DB_MYSQL=#{Smartcloud.credentials.redmine[:database_host]} \
-						--env REDMINE_DB_PORT=#{Smartcloud.credentials.redmine[:database_port]} \
-						--env REDMINE_DB_USERNAME=#{Smartcloud.credentials.redmine[:database_username]} \
-						--env REDMINE_DB_PASSWORD=#{Smartcloud.credentials.redmine[:database_password]} \
-						--env REDMINE_DB_DATABASE=#{Smartcloud.credentials.redmine[:database_name]} \
-						--env REDMINE_PLUGINS_MIGRATE=#{Smartcloud.credentials.redmine[:plugins_migrate]} \
-						--volume='#{Smartcloud.config.user_home_path}/.smartcloud/apps/repositories:/repositories:ro' \
-						--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-redmine/files:/usr/src/redmine/files' \
+						--env REDMINE_SECRET_KEY_BASE=#{SmartCloud.credentials.redmine[:secret_key_base]} \
+						--env REDMINE_DB_MYSQL=#{SmartCloud.credentials.redmine[:database_host]} \
+						--env REDMINE_DB_PORT=#{SmartCloud.credentials.redmine[:database_port]} \
+						--env REDMINE_DB_USERNAME=#{SmartCloud.credentials.redmine[:database_username]} \
+						--env REDMINE_DB_PASSWORD=#{SmartCloud.credentials.redmine[:database_password]} \
+						--env REDMINE_DB_DATABASE=#{SmartCloud.credentials.redmine[:database_name]} \
+						--env REDMINE_PLUGINS_MIGRATE=#{SmartCloud.credentials.redmine[:plugins_migrate]} \
+						--volume='#{SmartCloud.config.user_home_path}/.smartcloud/apps/repositories:/repositories:ro' \
+						--volume='#{SmartCloud.config.user_home_path}/.smartcloud/grids/redmine/files:/usr/src/redmine/files' \
 						--restart='always' \
 						--network='nginx-network' \
 						redmine:4.0.5-alpine", out: File::NULL)
@@ -40,7 +40,7 @@ module Smartcloud
 			end
 	
 			def self.down
-				if Smartcloud::Docker.running?
+				if SmartCloud::Docker.running?
 					# Stopping & Removing containers - in reverse order
 					print "-----> Stopping container redmine ... "
 					if system("docker stop 'redmine'", out: File::NULL)

data/lib/{smartcloud → smart_cloud}/logger.rb

@@ -2,10 +2,10 @@ require "logger"
 
 $stdout.sync = true
 
-module Smartcloud
+module SmartCloud
 	module Logger
 	  def logger
-	    @logger ||= Smartcloud::Logger.logger_for(self.class.name)
+	    @logger ||= SmartCloud::Logger.logger_for(self.class.name)
 	  end
 
 	  # Use a hash class-ivar to cache a unique Logger per class:
@@ -14,7 +14,7 @@ module Smartcloud
 	  def self.included(base)
 		class << base
 			def logger
-			  @logger ||= Smartcloud::Logger.logger_for(self.name)
+			  @logger ||= SmartCloud::Logger.logger_for(self.name)
 			end
 		end
 	  end
@@ -26,7 +26,7 @@ module Smartcloud
 
 	    def configure_logger_for(classname)
 	      logger = ::Logger.new($stdout)
-		  logger.level = ::Logger.const_get("#{Smartcloud.config.logger_level}".upcase)
+		  logger.level = ::Logger.const_get("#{SmartCloud.config.logger_level}".upcase)
 	      logger.progname = classname
 	      logger
 	    end

data/lib/{smartcloud → smart_cloud}/machine.rb

@@ -1,8 +1,8 @@
 require "net/ssh"
 
-# The main Smartcloud Machine driver
-module Smartcloud
-	class Machine < Smartcloud::Base
+# The main SmartCloud Machine driver
+module SmartCloud
+	class Machine < SmartCloud::Base
 		def initialize
 		end
 
@@ -11,58 +11,58 @@ module Smartcloud
 
 			name = args.shift
 			FileUtils.mkdir name
-			FileUtils.cp_r "#{Smartcloud.config.root_path}/lib/smartcloud/templates/dotsmartcloud/.", "#{name}"
+			FileUtils.cp_r "#{SmartCloud.config.root_path}/lib/smartcloud/templates/dotsmartcloud/.", "#{name}"
 			FileUtils.chdir "#{name}" do
-				credentials = Smartcloud::Credentials.new
+				credentials = SmartCloud::Credentials.new
 				credentials.create
 			end
 			puts "New machine #{name} has been created."
 		end
 
 		def start
-			Smartcloud::Docker.install
+			SmartCloud::Docker.new.install
 
-			engine = Smartcloud::Engine.new
+			engine = SmartCloud::Engine.new
 			engine.install
 
-			ssh = Smartcloud::SSH.new
+			ssh = SmartCloud::SSH.new
 			ssh.run "smartcloud buildpacker install"
 			ssh.run "smartcloud prereceiver install"
 
-			elasticsearch = Smartcloud::Grids::Elasticsearch.new
+			elasticsearch = SmartCloud::Grids::Elasticsearch.new
 			elasticsearch.install
 		end
 
 		def stop
-			elasticsearch = Smartcloud::Grids::Elasticsearch.new
+			elasticsearch = SmartCloud::Grids::Elasticsearch.new
 			elasticsearch.uninstall
 
-			ssh = Smartcloud::SSH.new
+			ssh = SmartCloud::SSH.new
 			ssh.run "smartcloud prereceiver uninstall"
 			ssh.run "smartcloud buildpacker uninstall"
 
-			engine = Smartcloud::Engine.new
+			engine = SmartCloud::Engine.new
 			engine.uninstall
 
-			Smartcloud::Docker.uninstall
+			SmartCloud::Docker.new.uninstall
 		end
 
 		def grid(*args)
 			args.flatten!
 
-			ssh = Smartcloud::SSH.new
+			ssh = SmartCloud::SSH.new
 			ssh.run "smartcloud run grid #{args.join(" ")}"
 		end
 
 		def app(*args)
 			args.flatten!
 
-			ssh = Smartcloud::SSH.new
+			ssh = SmartCloud::SSH.new
 			ssh.run "smartcloud run app #{args.join(" ")}"
 		end
 
 		def ssh
-			ssh = Smartcloud::SSH.new
+			ssh = SmartCloud::SSH.new
 			ssh.login
 		end
 
@@ -80,7 +80,7 @@ module Smartcloud
 				raise "Invalid run command. Please try again."
 			end
 
-			controller = "Smartcloud::#{controller_type.capitalize}::#{controller_name.capitalize}"
+			controller = "SmartCloud::#{controller_type.capitalize}::#{controller_name.capitalize}"
 			action = args.shift.to_sym
 
 			args.empty? ? Object.const_get(controller).public_send(action) : Object.const_get(controller).public_send(action, args)
@@ -142,12 +142,12 @@ module Smartcloud
 			# sudo fail2ban-client status
 		end
 
-		def self.smartcloud_local?
+		def self.local?
 			File.file?("./config/master.key")
 		end
 
-		def self.smartcloud_server?
-			File.directory?("#{Smartcloud.config.user_home_path}/.smartcloud")
+		def self.remote?
+			File.directory?("#{SmartCloud.config.user_home_path}/.smartcloud")
 		end
 
 		def sync(first_sync = false)
@@ -167,12 +167,12 @@ module Smartcloud
 
 		def sync_pull
 			puts "-----> Sync pulling ... "
-			system("rsync -azumv --delete --include={#{sync_pull_files_list}} --exclude=* -e ssh #{Smartcloud.credentials.machine[:username]}@#{Smartcloud.credentials.machine[:host]}:~/.smartcloud/ .")
+			system("rsync -azumv --delete --include={#{sync_pull_files_list}} --exclude=* -e ssh #{SmartCloud.credentials.machine[:username]}@#{SmartCloud.credentials.machine[:address]}:~/.smartcloud/ .")
 		end
 
 		def sync_push
 			puts "-----> Sync pushing ... "
-			system("rsync -azumv --delete --include={#{sync_push_files_list}} --exclude=* -e ssh ./ #{Smartcloud.credentials.machine[:username]}@#{Smartcloud.credentials.machine[:host]}:~/.smartcloud")
+			system("rsync -azumv --delete --include={#{sync_push_files_list}} --exclude=* -e ssh ./ #{SmartCloud.credentials.machine[:username]}@#{SmartCloud.credentials.machine[:address]}:~/.smartcloud")
 		end
 
 		def sync_pull_files_list
@@ -181,27 +181,27 @@ module Smartcloud
 
 				'grids',
 
-				'grids/grid-elasticsearch',
-				'grids/grid-elasticsearch/data/***',
-				'grids/grid-elasticsearch/logs/***',
+				'grids/elasticsearch',
+				'grids/elasticsearch/data/***',
+				'grids/elasticsearch/logs/***',
 
-				'grids/grid-minio',
-				'grids/grid-minio/data/***',
+				'grids/minio',
+				'grids/minio/data/***',
 
-				'grids/grid-mysql',
-				'grids/grid-mysql/data/***',
+				'grids/mysql',
+				'grids/mysql/data/***',
 
-				'grids/grid-nextcloud',
-				'grids/grid-nextcloud/html/***',
+				'grids/nextcloud',
+				'grids/nextcloud/html/***',
 
-				'grids/grid-nginx',
-				'grids/grid-nginx/certificates/***',
+				'grids/nginx',
+				'grids/nginx/certificates/***',
 
-				'grids/grid-redmine',
-				'grids/grid-redmine/files/***',
+				'grids/redmine',
+				'grids/redmine/files/***',
 
-				'grids/grid-solr',
-				'grids/grid-solr/solr/***',
+				'grids/solr',
+				'grids/solr/solr/***',
 			]
 			files.join(',')
 		end
@@ -222,49 +222,49 @@ module Smartcloud
 
 				'grids',
 
-				'grids/grid-elasticsearch',
-				'grids/grid-elasticsearch/data',
-				'grids/grid-elasticsearch/data/.keep',
-				'grids/grid-elasticsearch/logs',
-				'grids/grid-elasticsearch/logs/.keep',
-
-				'grids/grid-minio',
-				'grids/grid-minio/data',
-				'grids/grid-minio/data/.keep',
-
-				'grids/grid-mysql',
-				'grids/grid-mysql/data',
-				'grids/grid-mysql/data/.keep',
-
-				'grids/grid-nextcloud',
-				'grids/grid-nextcloud/html',
-				'grids/grid-nextcloud/html/.keep',
-				'grids/grid-nextcloud/html/apps',
-				'grids/grid-nextcloud/html/apps/.keep',
-				'grids/grid-nextcloud/html/config',
-				'grids/grid-nextcloud/html/config/.keep',
-
-				'grids/grid-nginx',
-				'grids/grid-nginx/certificates',
-				'grids/grid-nginx/certificates/.keep',
-				'grids/grid-nginx/htpasswd/***',
-				'grids/grid-nginx/fastcgi.conf',
-				'grids/grid-nginx/nginx.tmpl',
-
-				'grids/grid-prereceiver',
-				'grids/grid-prereceiver/pre-receive',
-
-				'grids/grid-redis',
-				'grids/grid-redis/data',
-				'grids/grid-redis/data/.keep',
-
-				'grids/grid-redmine',
-				'grids/grid-redmine/files',
-				'grids/grid-redmine/files/.keep',
-
-				'grids/grid-solr',
-				'grids/grid-solr/solr',
-				'grids/grid-solr/solr/.keep',
+				'grids/elasticsearch',
+				'grids/elasticsearch/data',
+				'grids/elasticsearch/data/.keep',
+				'grids/elasticsearch/logs',
+				'grids/elasticsearch/logs/.keep',
+
+				'grids/minio',
+				'grids/minio/data',
+				'grids/minio/data/.keep',
+
+				'grids/mysql',
+				'grids/mysql/data',
+				'grids/mysql/data/.keep',
+
+				'grids/nextcloud',
+				'grids/nextcloud/html',
+				'grids/nextcloud/html/.keep',
+				'grids/nextcloud/html/apps',
+				'grids/nextcloud/html/apps/.keep',
+				'grids/nextcloud/html/config',
+				'grids/nextcloud/html/config/.keep',
+
+				'grids/nginx',
+				'grids/nginx/certificates',
+				'grids/nginx/certificates/.keep',
+				'grids/nginx/htpasswd/***',
+				'grids/nginx/fastcgi.conf',
+				'grids/nginx/nginx.tmpl',
+
+				'grids/prereceiver',
+				'grids/prereceiver/pre-receive',
+
+				'grids/redis',
+				'grids/redis/data',
+				'grids/redis/data/.keep',
+
+				'grids/redmine',
+				'grids/redmine/files',
+				'grids/redmine/files/.keep',
+
+				'grids/solr',
+				'grids/solr/solr',
+				'grids/solr/solr/.keep',
 
 				'tmp/***',
 			]