smartmachine 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d77d6ff76ab2f6f4337bebd16aa3151238818d1abc8adc35acbf70bc6d7d4489
-  data.tar.gz: c4bdace421a0d57b8ad4604660ab0950217720cb9aa7a9f3d037ae2ab6e8ee3e
+  metadata.gz: 7216722bfdaa3eefae5c9de4eaa5b21c684b281226a917923ba3d09801471bc8
+  data.tar.gz: 1b9e007c73ec297eb4c27d61de76e21ea612f81e4252a65f18a835f8ed1c2326
 SHA512:
-  metadata.gz: df9e0408228f0af69b30ab32d2754f9231e25656b8947032d44ea9b592ca436c269df8f3a7f0ea77a9330e4e726d2cca9a727e7bcd1d037b21648f17c0cad376
-  data.tar.gz: c9b22b7c5d2ba4b82ce3d7d17f8254d51f3dc9cf8d805a3a554bf4becec31b46d3ef80b8d3cb582a529d652a3b0f67cb7f6e33c853421863f87dd7ff5e7f7123
+  metadata.gz: 1e5ebde0903f967e19f36d238e767ae189de377ff3c404adc721b2f28c588a51a9165b38938098bb2c533c9320e7dc0188d91f2cb0a01848b3f789e52adc8866
+  data.tar.gz: 9b70003e202c55ae5f85ef1866b43804bfd226ed853ad01d99fdf2b9df66d457912f17959f6ed32df3998ddb2159b5720049cf0ea10668955fba7189c3ce7397

data/README.md

@@ -50,13 +50,9 @@ Add your credentials using:
 
     $ smartmachine credentials:edit
 
-Add your environment details using: - Coming Soon
+Add your config details with your favourite editor (here emacs is shown):
 
-    $ smartmachine environment:edit
-
-Add your users using:
-
-    $ smartmachine grid nginx users:edit
+    $ emacs ./config
 
 Install docker, and add UFW rules for Docker if specified at the end of installation.
 
@@ -111,14 +107,6 @@ Lets you run redis server instance for cache storage and job queueing.
     $ smartmachine grid redis up
     $ smartmachine grid redis down
 
-#### 6. Scheduler Grid - Coming Soon
-Lets you setup scheduling services like database backups, etc.
-
-    $ smartmachine grid scheduler install
-    $ smartmachine grid scheduler up
-    $ smartmachine grid scheduler down
-    $ smartmachine grid scheduler uninstall
-
 ### Setup Your Apps
 
 Create your apps and manage them.

data/lib/smart_machine/apps/container.rb

@@ -26,6 +26,7 @@ module SmartMachine
           "--workdir /app",
           "--expose='3000'",
           "--volume='#{@home_dir}/smartmachine/config/environment.rb:#{@home_dir}/machine/config/environment.rb'",
+          "--volume='#{@home_dir}/smartmachine/apps/containers/#{@appname}/asdf:#{@home_dir}/.asdf'",
           "--volume='#{@home_dir}/smartmachine/apps/containers/#{@appname}/releases/#{@appversion}:/app'",
           "--volume='#{@home_dir}/smartmachine/apps/containers/#{@appname}/app/vendor/bundle:/app/vendor/bundle'",
           "--volume='#{@home_dir}/smartmachine/apps/containers/#{@appname}/app/public/assets:/app/public/assets'",

data/lib/smart_machine/apps/manager.rb

@@ -105,7 +105,7 @@ module SmartMachine
 
       def containerize_process!(name:, config:)
         container = SmartMachine::Apps::Container.new(name: name, appname: @appname, appversion: @appversion)
-        if container.create!(using_command: config.dig(:command))
+        if container.create!(using_command: user_bash(config.dig(:command)))
           networks = config.dig(:networks)&.split(" ")
           networks.each do |network|
             container.connect_to_network!(network_name: network)

data/lib/smart_machine/base.rb

@@ -1,5 +1,6 @@
 require 'smart_machine/logger'
 require "active_support/inflector"
+require 'active_support/core_ext/string/filters'
 
 module SmartMachine
   class Base
@@ -25,5 +26,10 @@ module SmartMachine
       machine = SmartMachine::Machine.new
       machine.run_on_machine(commands: ["which smartengine | grep -q '/smartengine'"])
     end
+
+    def user_bash(command)
+      remove_envs = %w(RUBY_MAJOR RUBY_VERSION RUBY_DOWNLOAD_SHA256 GEM_HOME BUNDLE_APP_CONFIG BUNDLE_SILENCE_ROOT_WARNING)
+      'env -u ' + remove_envs.join(' -u ') + ' bash --login -c \'' + command + '\''
+    end
   end
 end

data/lib/smart_machine/buildpackers/buildpacker.rb

@@ -14,7 +14,7 @@ module SmartMachine
               "--build-arg SMARTMACHINE_VERSION=#{SmartMachine.version}",
               "--build-arg USER_UID=`id -u`",
               "--build-arg USER_NAME=`id -un`",
-              "#{SmartMachine.config.gem_dir}/lib/smart_machine/buildpackers/rails"
+              "-<<'EOF'\n#{dockerfile_rails}EOF"
             ]
             if system(command.join(" "), out: File::NULL)
               puts "done"
@@ -53,6 +53,54 @@ module SmartMachine
         "smartmachine/buildpackers/rails:#{SmartMachine.version}"
       end
 
+      def dockerfile_rails
+        file = <<~'DOCKERFILE'
+	  ARG SMARTMACHINE_VERSION
+
+	  FROM smartmachine/smartengine:$SMARTMACHINE_VERSION
+	  LABEL maintainer="plainsource <plainsource@humanmind.me>"
+
+	  RUN apt-get update && \
+	      apt-get install -y --no-install-recommends \
+	        # dependencies for ruby from https://github.com/rbenv/ruby-build/wiki#ubuntudebianmint
+                autoconf \
+                bison \
+                patch \
+                build-essential \
+                rustc \
+                libssl-dev \
+                libyaml-dev \
+                libreadline6-dev \
+                zlib1g-dev \
+                libgmp-dev \
+                libncurses5-dev \
+                libffi-dev \
+                libgdbm6 \
+                libgdbm-dev \
+                libdb-dev \
+                uuid-dev && \
+              # ruby on rails
+              curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+	      echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+	      apt-get update && \
+	      apt-get install -y --no-install-recommends \
+		  tzdata \
+		  nodejs \
+		  yarn \
+		  libmariadb-dev \
+		  libvips42 \
+		  ffmpeg \
+		  mupdf \
+		  mupdf-tools \
+		  poppler-utils && \
+              rm -rf /var/lib/apt/lists/*
+
+	  CMD ["smartmachine", "buildpacker", "packer", "rails"]
+        DOCKERFILE
+
+        format(file)
+      end
+
       # These swapfile methods can be used (after required modification), when you need to make swapfile for more memory.
       # def self.create_swapfile
       # 	# Creating swapfile for bundler to work properly

data/lib/smart_machine/buildpackers/rails.rb

@@ -42,6 +42,7 @@ module SmartMachine
         FileUtils.mkdir_p("#{@container_path}/app/public/packs")
         FileUtils.mkdir_p("#{@container_path}/app/node_modules")
         FileUtils.mkdir_p("#{@container_path}/app/storage")
+        FileUtils.mkdir_p("#{@container_path}/asdf")
         FileUtils.mkdir_p("#{@container_path}/releases/#{@appversion}/vendor/bundle")
         FileUtils.mkdir_p("#{@container_path}/releases/#{@appversion}/public/assets")
         FileUtils.mkdir_p("#{@container_path}/releases/#{@appversion}/public/packs")
@@ -62,13 +63,15 @@ module SmartMachine
       def packer
         set_logger_formatter_arrow
 
+        # TODO: The exec of final process should be done only in the Manager#containerize_process! and should be removed from here.
+        # This method should only pack a fully functioning container and do nothing else.
         if File.exist? "tmp/smartmachine/packed"
           begin
             pid = File.read('tmp/smartmachine/packed').to_i
             Process.kill('QUIT', pid)
           rescue Errno::ESRCH # No such process
           end
-          exec "bundle", "exec", "puma", "--config", "config/puma.rb"
+          exec(user_bash("bundle exec puma --config config/puma.rb"))
         else
           if initial_setup? && bundle_install? && precompile_assets? && db_migrate? && test_web_server?
             logger.formatter = nil
@@ -89,18 +92,90 @@ module SmartMachine
       def initial_setup?
         logger.info "Performing initial setup ..."
 
-        exit_status = nil
+        set_logger_formatter_tabs
 
         # Fix for mysql2 gem to support sha256_password, until it is fixed in main mysql2 gem.
         # https://github.com/brianmario/mysql2/issues/1023
-        exit_status = system("mkdir -p ./lib/mariadb && ln -s /usr/lib/mariadb/plugin ./lib/mariadb/plugin")
+        unless system("mkdir -p ./lib/mariadb && ln -s /usr/lib/mariadb/plugin ./lib/mariadb/plugin")
+          logger.error "Could not setup fix for mysql2 mariadb folders."
+          return false
+        end
 
-        if exit_status
-          return true
-        else
-          logger.error "Could not complete initial setup."
+        # Install asdf
+        system("echo '\n# asdf version manager\nif [ -f \"$HOME/.asdf/asdf.sh\" ]; then\n    . \"$HOME/.asdf/asdf.sh\"\nfi\nif [ -f \"$HOME/.asdf/completions/asdf.bash\" ]; then\n    . \"$HOME/.asdf/completions/asdf.bash\"\nfi' >> ~/.profile", out: File::NULL)
+        unless system(user_bash("asdf --version"), [:out, :err] => File::NULL)
+          asdf_version = `git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags https://github.com/asdf-vm/asdf.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3`.strip
+          logger.info "Installing asdf #{asdf_version}...\n"
+
+          # Clear all files inside .asdf dir including dot files.
+          system("rm -rf ~/.asdf/..?* ~/.asdf/.[!.]* ~/.asdf/*")
+          Open3.popen2e(user_bash("git -c advice.detachedHead=false clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch #{asdf_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+
+          unless system(user_bash("asdf --version"), [:out, :err] => File::NULL)
+            logger.error "Could not install asdf.\n"
+            return false
+          end
+        end
+        logger.info "Using asdf " + `#{user_bash("asdf --version")}`.strip + "\n"
+
+        # Install ruby
+        ruby_version = `sed -n '/RUBY VERSION/{n;p}' Gemfile.lock`.strip.split(" ").last&.split("p")&.first
+        if ruby_version.nil? || ruby_version.empty?
+          logger.error "Could not find ruby version. Have you specified it explicitly in Gemfile and run bundle install?\n"
+          return false
+        end
+
+        unless `#{user_bash('ruby -e "puts RUBY_VERSION"')}`.strip == ruby_version
+          logger.info "Installing ruby v#{ruby_version}\n"
+
+          Open3.popen2e(user_bash("asdf plugin add ruby https://github.com/asdf-vm/asdf-ruby.git")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf plugin update ruby")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf install ruby #{ruby_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf local ruby #{ruby_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+
+          unless `#{user_bash('ruby -e "puts RUBY_VERSION"')}`.strip == ruby_version
+            logger.error "Could not install ruby with version #{ruby_version}. Please try another valid version that asdf supports.\n"
+            return false
+          end
+        end
+        logger.info "Using ruby v" + `#{user_bash('ruby -e "puts RUBY_VERSION"')}`.strip + "\n"
+
+        # Install bundler
+        bundler_version = `sed -n '/BUNDLED WITH/{n;p}' Gemfile.lock`.strip
+        if bundler_version.nil? || bundler_version.empty?
+          logger.error "Could not find bundler version. Please ensure BUNDLED_WITH section is present in your Gemfile.lock.\n"
           return false
         end
+
+        unless system(user_bash("gem list -i '^bundler$' --version #{bundler_version}"), out: File::NULL)
+          logger.info "Installing bundler v#{bundler_version}\n"
+
+          Open3.popen2e(user_bash("gem install --no-document bundler -v #{bundler_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+
+          unless system(user_bash("gem list -i '^bundler$' --version #{bundler_version}"), out: File::NULL)
+            logger.error "Could not install bundler with version #{bundler_version}.\n"
+            return false
+          end
+        end
+        system("alias bundle='bundle _#{bundler_version}_'")
+        system("alias bundler='bundler _#{bundler_version}_'")
+        logger.info "Using bundler v" + bundler_version + "\n"
+
+        set_logger_formatter_arrow
+
+        return true
       end
 
       # Perform bundle install
@@ -109,13 +184,13 @@ module SmartMachine
 
         set_logger_formatter_tabs
 
-        unless system("bundle config set deployment 'true' && bundle config set clean 'true'")
+        unless system(user_bash("bundle config set --local deployment 'true' && bundle config set --local clean 'true'"))
           logger.error "Could not complete bundle config setting."
           return false
         end
 
         exit_status = nil
-        Open3.popen2e("bundle", "install") do |stdin, stdout_and_stderr, wait_thr|
+        Open3.popen2e(user_bash("bundle install")) do |stdin, stdout_and_stderr, wait_thr|
           stdout_and_stderr.each { |line| logger.info "#{line}" }
           exit_status = wait_thr.value.success?
         end
@@ -135,7 +210,7 @@ module SmartMachine
 
         set_logger_formatter_tabs
         exit_status = nil
-        Open3.popen2e("bundle", "exec", "rails", "assets:precompile") do |stdin, stdout_and_stderr, wait_thr|
+        Open3.popen2e(user_bash("bundle exec rails assets:precompile")) do |stdin, stdout_and_stderr, wait_thr|
           stdout_and_stderr.each { |line| logger.info "#{line}" }
           exit_status = wait_thr.value.success?
         end
@@ -157,7 +232,7 @@ module SmartMachine
 
         set_logger_formatter_tabs
         exit_status = nil
-        Open3.popen2e("bundle", "exec", "rails", "db:migrate") do |stdin, stdout_and_stderr, wait_thr|
+        Open3.popen2e(user_bash("bundle exec rails db:migrate")) do |stdin, stdout_and_stderr, wait_thr|
           stdout_and_stderr.each { |line| logger.info "#{line}" }
           exit_status = wait_thr.value.success?
         end
@@ -181,7 +256,7 @@ module SmartMachine
         FileUtils.rm_f("tmp/smartmachine/packed")
 
         # Spawn Process
-        pid = Process.spawn("bundle", "exec", "puma", "--config", "config/puma.rb", out: File::NULL)
+        pid = Process.spawn(user_bash("bundle exec puma --config config/puma.rb"), out: File::NULL)
         Process.detach(pid)
 
         # Sleep

data/lib/smart_machine/commands/grid.rb

@@ -2,9 +2,11 @@ require 'smart_machine/commands/grid_commands/sub_thor'
 require 'smart_machine/commands/grid_commands/elasticsearch'
 require 'smart_machine/commands/grid_commands/minio'
 require 'smart_machine/commands/grid_commands/mysql'
+require 'smart_machine/commands/grid_commands/nextcloud'
 require 'smart_machine/commands/grid_commands/nginx'
 require 'smart_machine/commands/grid_commands/prereceiver'
 require 'smart_machine/commands/grid_commands/redis'
+require 'smart_machine/commands/grid_commands/terminal'
 
 module SmartMachine
   module Commands
@@ -20,6 +22,9 @@ module SmartMachine
       desc "mysql", "Run mysql grid commands"
       subcommand "mysql", GridCommands::Mysql
 
+      desc "nextcloud", "Run nextcloud grid commands"
+      subcommand "nextcloud", GridCommands::Nextcloud
+
       desc "nginx", "Run nginx grid commands"
       subcommand "nginx", GridCommands::Nginx
 
@@ -28,6 +33,9 @@ module SmartMachine
 
       desc "redis", "Run redis grid commands"
       subcommand "redis", GridCommands::Redis
+
+      desc "terminal", "Run terminal grid commands"
+      subcommand "terminal", GridCommands::Terminal
     end
   end
 end

data/lib/smart_machine/commands/grid_commands/elasticsearch.rb

@@ -11,7 +11,6 @@ module SmartMachine
             with_docker_running do
               machine = SmartMachine::Machine.new
               name_option = options[:name] ? " --name=#{options[:name]}" : ""
-              machine.run_on_machine commands: "echo 'vm.max_map_count=262144' | sudo tee /etc/sysctl.d/60-smartmachine-elasticsearch.conf && sudo sysctl --system"
               machine.run_on_machine commands: "smartengine grid elasticsearch uper#{name_option}"
             end
           end
@@ -25,8 +24,6 @@ module SmartMachine
               machine = SmartMachine::Machine.new
               name_option = options[:name] ? " --name=#{options[:name]}" : ""
               machine.run_on_machine commands: "smartengine grid elasticsearch downer#{name_option}"
-              # NOTE: sysctl does not reset this setting until restart of system even after sudo sysctl --system is run.
-              machine.run_on_machine commands: "test $(docker ps -aq --filter label=smartmachine.elasticsearch.name | wc -l) -eq 0 && test -f /etc/sysctl.d/60-smartmachine-elasticsearch.conf && sudo rm /etc/sysctl.d/60-smartmachine-elasticsearch.conf && sudo sysctl --system"
             end
           end
         end

data/lib/smart_machine/commands/grid_commands/nextcloud.rb

@@ -0,0 +1,65 @@
+module SmartMachine
+  module Commands
+    module GridCommands
+      class Nextcloud < SubThor
+        include Utilities
+
+        desc "up", "Take UP the nextcloud grid"
+        option :name, type: :string
+        def up
+          inside_machine_dir do
+            with_docker_running do
+              machine = SmartMachine::Machine.new
+              name_option = options[:name] ? " --name=#{options[:name]}" : ""
+              machine.run_on_machine commands: "smartengine grid nextcloud uper#{name_option}"
+            end
+          end
+        end
+
+        desc "down", "Take DOWN the nextcloud grid"
+        option :name, type: :string
+        def down
+          inside_machine_dir do
+            with_docker_running do
+              machine = SmartMachine::Machine.new
+              name_option = options[:name] ? " --name=#{options[:name]}" : ""
+              machine.run_on_machine commands: "smartengine grid nextcloud downer#{name_option}"
+            end
+          end
+        end
+
+        desc "uper", "Nextcloud grid uper", hide: true
+        option :name, type: :string
+        def uper
+          inside_engine_machine_dir do
+            if options[:name]
+              nextcloud = SmartMachine::Grids::Nextcloud.new(name: options[:name])
+              nextcloud.uper
+            else
+              SmartMachine.config.grids.nextcloud.each do |name, config|
+                nextcloud = SmartMachine::Grids::Nextcloud.new(name: name.to_s)
+                nextcloud.uper
+              end
+            end
+          end
+        end
+
+        desc "downer", "Nextcloud grid downer", hide: true
+        option :name, type: :string
+        def downer
+          inside_engine_machine_dir do
+            if options[:name]
+              nextcloud = SmartMachine::Grids::Nextcloud.new(name: options[:name])
+              nextcloud.downer
+            else
+              SmartMachine.config.grids.nextcloud.each do |name, config|
+                nextcloud = SmartMachine::Grids::Nextcloud.new(name: name.to_s)
+                nextcloud.downer
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smart_machine/commands/grid_commands/terminal.rb

@@ -0,0 +1,107 @@
+module SmartMachine
+  module Commands
+    module GridCommands
+      class Terminal < SubThor
+        include Utilities
+
+        desc "install", "Install terminal grid"
+        def install
+          inside_machine_dir do
+            with_docker_running do
+              puts "-----> Installing Terminal"
+              machine = SmartMachine::Machine.new
+              machine.run_on_machine commands: "smartengine grid terminal installer"
+              puts "-----> Terminal Installation Complete"
+            end
+          end
+        end
+
+        desc "uninstall", "Uninstall terminal grid"
+        def uninstall
+          inside_machine_dir do
+            with_docker_running do
+              puts "-----> Uninstalling Terminal"
+              machine = SmartMachine::Machine.new
+              machine.run_on_machine commands: "smartengine grid terminal uninstaller"
+              puts "-----> Terminal Uninstallation Complete"
+            end
+          end
+        end
+
+        desc "up", "Take UP the terminal grid"
+        option :name, type: :string
+        def up
+          inside_machine_dir do
+            with_docker_running do
+              machine = SmartMachine::Machine.new
+              name_option = options[:name] ? " --name=#{options[:name]}" : ""
+              machine.run_on_machine commands: "smartengine grid terminal uper#{name_option}"
+            end
+          end
+        end
+
+        desc "down", "Take DOWN the terminal grid"
+        option :name, type: :string
+        def down
+          inside_machine_dir do
+            with_docker_running do
+              machine = SmartMachine::Machine.new
+              name_option = options[:name] ? " --name=#{options[:name]}" : ""
+              machine.run_on_machine commands: "smartengine grid terminal downer#{name_option}"
+            end
+          end
+        end
+
+        desc "installer", "Terminal grid installer", hide: true
+        def installer
+          inside_engine_machine_dir do
+            name, config = SmartMachine.config.grids.terminal.first
+            terminal = SmartMachine::Grids::Terminal.new(name: name.to_s)
+            terminal.installer
+          end
+        end
+
+        desc "uninstaller", "Terminal grid uninstaller", hide: true
+        def uninstaller
+          inside_engine_machine_dir do
+            name, config = SmartMachine.config.grids.terminal.first
+            terminal = SmartMachine::Grids::Terminal.new(name: name.to_s)
+            terminal.uninstaller
+          end
+        end
+
+        desc "uper", "Terminal grid uper", hide: true
+        option :name, type: :string
+        def uper
+          inside_engine_machine_dir do
+            if options[:name]
+              terminal = SmartMachine::Grids::Terminal.new(name: options[:name])
+              terminal.uper
+            else
+              SmartMachine.config.grids.terminal.each do |name, config|
+                terminal = SmartMachine::Grids::Terminal.new(name: name.to_s)
+                terminal.uper
+              end
+            end
+          end
+        end
+
+        desc "downer", "Terminal grid downer", hide: true
+        option :name, type: :string
+        def downer
+          inside_engine_machine_dir do
+            if options[:name]
+              terminal = SmartMachine::Grids::Terminal.new(name: options[:name])
+              terminal.downer
+            else
+              SmartMachine.config.grids.terminal.each do |name, config|
+                terminal = SmartMachine::Grids::Terminal.new(name: name.to_s)
+                terminal.downer
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smart_machine/commands/machine.rb

@@ -3,6 +3,14 @@ module SmartMachine
     class Machine < Thor
       include Utilities
 
+      desc "setup", "Initial setup of the machine"
+      def setup
+        inside_machine_dir do
+          machine = SmartMachine::Machine.new
+          machine.setup
+        end
+      end
+
       desc "ssh", "SSH into the machine"
       def ssh
         inside_machine_dir do

data/lib/smart_machine/configuration.rb

@@ -14,7 +14,7 @@ module SmartMachine
     private
 
     def grids
-      @grids ||= OpenStruct.new(elasticsearch: elasticsearch, minio: minio, mysql: mysql, prereceiver: prereceiver, redis: redis)
+      @grids ||= OpenStruct.new(elasticsearch: elasticsearch, minio: minio, mysql: mysql, nextcloud: nextcloud, prereceiver: prereceiver, redis: redis, terminal: terminal)
     end
 
     def elasticsearch
@@ -50,6 +50,17 @@ module SmartMachine
       end
     end
 
+    def nextcloud
+      # Once the SmartMachine.config assignments in smart_machine.rb file has been removed, then this file exist condition can be removed to ensure that config/nextcloud.yml always exists
+      if File.exist? "config/nextcloud.yml"
+        deserialize(IO.binread("config/nextcloud.yml")).deep_symbolize_keys
+      elsif File.exist? "#{File.expand_path('~')}/machine/config/nextcloud.yml"
+        deserialize(IO.binread("#{File.expand_path('~')}/machine/config/nextcloud.yml")).deep_symbolize_keys
+      else
+        {}
+      end
+    end
+
     def prereceiver
       # Once the SmartMachine.config assignments in smart_machine.rb file has been removed, then this file exist condition can be removed to ensure that config/prereceiver.yml always exists
       if File.exist? "config/prereceiver.yml"
@@ -72,6 +83,17 @@ module SmartMachine
       end
     end
 
+    def terminal
+      # Once the SmartMachine.config assignments in smart_machine.rb file has been removed, then this file exist condition can be removed to ensure that config/terminal.yml always exists
+      if File.exist? "config/terminal.yml"
+        deserialize(IO.binread("config/terminal.yml")).deep_symbolize_keys
+      elsif File.exist? "#{File.expand_path('~')}/machine/config/terminal.yml"
+        deserialize(IO.binread("#{File.expand_path('~')}/machine/config/terminal.yml")).deep_symbolize_keys
+      else
+        {}
+      end
+    end
+
     def deserialize(config)
       YAML.load(ERB.new(config).result).presence || {}
     end

data/lib/smart_machine/credentials.rb

@@ -66,6 +66,15 @@ module SmartMachine
 			    database_name: #{SecureRandom.hex(8)}
 			  redisone:
 			    password: #{SecureRandom.hex(16)}
+			  nextcloudone:
+			    admin_user: #{SecureRandom.hex(8)}
+			    admin_password: #{SecureRandom.hex(16)}
+			    mysql_user: #{SecureRandom.hex(8)}
+			    mysql_password: #{SecureRandom.hex(16)}
+			    mysql_database_name: #{SecureRandom.hex(8)}
+			  terminalone:
+			    username: #{SecureRandom.hex(8)}
+			    password: #{SecureRandom.hex(16)}
 			YAML
     end
 

data/lib/smart_machine/docker.rb

@@ -47,13 +47,14 @@ module SmartMachine
     def install_on_linuxos(distro_name:, arch:)
 
       commands = [
-        "sudo apt-get -y update",
-        "sudo apt-get -y install apt-transport-https ca-certificates curl gnupg-agent software-properties-common",
-        "curl -fsSL https://download.docker.com/linux/#{distro_name}/gpg | sudo apt-key add -",
-        "sudo apt-key fingerprint 0EBFCD88",
-        "sudo add-apt-repository \"deb [arch=#{arch}] https://download.docker.com/linux/#{distro_name} $(lsb_release -cs) stable\"",
-        "sudo apt-get -y update",
-        "sudo apt-get -y install docker-ce docker-ce-cli containerd.io",
+        "sudo apt-get update",
+        "sudo apt-get install -y ca-certificates curl gnupg lsb-release",
+        "sudo mkdir -p /etc/apt/keyrings",
+        "sudo rm -f /etc/apt/keyrings/docker.gpg",
+        "curl -fsSL https://download.docker.com/linux/#{distro_name}/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg",
+        "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/#{distro_name} $(lsb_release -cs) stable\" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null",
+        "sudo apt-get update",
+        "sudo apt-get install -y docker-ce docker-ce-cli containerd.io",
         "sudo usermod -aG docker $USER",
         "docker run --rm hello-world",
         "docker rmi hello-world"
@@ -95,8 +96,8 @@ module SmartMachine
     def uninstall_on_linuxos(distro_name:, arch:)
 
       commands = [
-        "sudo apt-get purge docker-ce docker-ce-cli containerd.io",
-        "sudo apt-get autoremove",
+        "sudo apt-get purge -y docker-ce docker-ce-cli containerd.io",
+        "sudo apt-get autoremove -y",
         "sudo rm -rf /var/lib/docker",
         "sudo rm -rf /var/lib/containerd"
       ]