smartmachine 1.0.1 → 1.1.1

data/lib/smart_machine/grids/terminal/init.el

@@ -0,0 +1,310 @@
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(package-selected-packages
+   '(polymode ruby-electric ruby-electric-mode ruby-mode dockerfile-mode expand-region flycheck zenburn-theme multi-vterm vterm yaml-mode web-mode use-package undo-tree typescript-mode smartparens robe rbenv rainbow-delimiters projectile-rails osx-trash magit logview indent-guide diredfl dired-sidebar dired-narrow dired-git-info diff-hl company clipetty bundler)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(diff-hl-change ((t (:foreground "#f7ca88" :background "#f7ca88"))))
+ '(diff-hl-delete ((t (:foreground "#ab4642" :background "#ab4642"))))
+ '(diff-hl-insert ((t (:foreground "#a1b56c" :background "#a1b56c")))))
+
+;; Add melpa to package-archives list.
+(require 'package)
+(add-to-list 'package-archives
+             '("melpa" . "http://melpa.org/packages/") t)
+
+;; use-package
+;; Ensure use-package is installed.
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+;; Configure and load use-package.
+(setq use-package-always-ensure t)
+(eval-when-compile
+  (defvar use-package-verbose t)
+  (require 'use-package))
+
+;; Disable menu bar in emacs.
+(menu-bar-mode -1)
+
+;; change backup file directory for emacs
+(setq backup-directory-alist `(("." . ,(concat user-emacs-directory "backups"))))
+
+;; Use gls instead of the default ls on darwain systems like Apple.
+;; coreutils is needed to be installed for gls. You can get it with brew install coreutils.
+;; This solves the --dired problem on macOS and lists the directories first in dired.
+(when (string= system-type "darwin")
+  (setq dired-use-ls-dired t
+        insert-directory-program "/usr/local/bin/gls"
+        dired-listing-switches "-aBhl --ignore=.DS_Store --ignore=.git --ignore=.bundle --ignore=.byebug_history --group-directories-first"))
+
+;; Hide dired details on startup
+(add-hook 'dired-mode-hook
+	  (lambda ()
+	    (dired-hide-details-mode)))
+
+;; Setup initial screen
+(setq initial-buffer-choice (expand-file-name "."))
+
+;; Org mode key bindings
+(global-set-key (kbd "C-c l") 'org-store-link)
+(global-set-key (kbd "C-c a") 'org-agenda)
+(global-set-key (kbd "C-c c") 'org-capture)
+
+;; Display line numbers.
+(when (version<= "26.0.50" emacs-version)
+  (global-display-line-numbers-mode))
+
+;; Highlight current line.
+(global-hl-line-mode +1)
+
+;; Revert buffers if they've changed on disk
+(global-auto-revert-mode 1)
+(setq auto-revert-verbose nil)
+
+;; Exclude directories from grep.
+(eval-after-load 'grep
+  '(progn
+     (add-to-list 'grep-find-ignored-directories "log")
+     (add-to-list 'grep-find-ignored-directories "node_modules")
+     (add-to-list 'grep-find-ignored-directories "public/packs")
+     (add-to-list 'grep-find-ignored-directories "storage")
+     (add-to-list 'grep-find-ignored-directories "tmp")
+     (add-to-list 'grep-find-ignored-directories ".bundle")
+     (add-to-list 'grep-find-ignored-directories "auto")
+     (add-to-list 'grep-find-ignored-directories "elpa")))
+
+(use-package zenburn-theme
+  :ensure t
+  :config
+  (load-theme 'zenburn t)
+  (zenburn-with-color-variables
+    (custom-theme-set-faces
+     'zenburn
+     `(hl-line-face ((t (:background ,zenburn-bg+05 ))))
+     `(hl-line ((t (:background ,zenburn-bg+05 ))))
+     `(region ((nil (:background ,zenburn-bg+2))))
+     )))
+
+(use-package logview
+  :ensure t)
+
+(use-package dired-hacks-utils
+  :ensure t)
+
+(use-package dired-narrow
+  :ensure t
+  :bind (:map dired-mode-map
+	      ("/" . dired-narrow)))
+
+(use-package dired-subtree
+  :ensure t
+  :after dired
+  :bind (:map dired-mode-map
+	      ("TAB" . dired-subtree-toggle)
+	      ("<backtab>" . dired-subtree-remove))
+  :config
+  (setq dired-subtree-use-backgrounds nil))
+
+(use-package dired-git-info
+  :ensure t
+  :bind (:map dired-mode-map
+	      (")" . dired-git-info-mode)))
+
+(use-package dired-sidebar
+  :ensure t
+  :commands (dired-sidebar-toggle-sidebar)
+  :bind (("C-x C-n" . dired-sidebar-toggle-sidebar))
+  :init
+  (setq dired-sidebar-use-term-integration t)
+  (setq dired-sidebar-use-custom-font t))
+
+(use-package typescript-mode
+  :ensure t)
+
+(use-package clipetty
+  :ensure t
+  :bind ("M-w" . clipetty-kill-ring-save))
+
+(use-package osx-trash
+  :config
+  (when (eq system-type 'darwin)
+    (osx-trash-setup))
+  (setq delete-by-moving-to-trash t))
+
+(use-package undo-tree
+  :config
+  (global-undo-tree-mode))
+
+(use-package indent-guide
+  :config
+  (setq indent-guide-delay 0.3)
+  (indent-guide-global-mode))
+
+(use-package rainbow-delimiters
+  :config
+  (add-hook 'prog-mode-hook #'rainbow-delimiters-mode))
+
+(use-package smartparens
+  :config
+  (require 'smartparens-config))
+(add-hook 'prog-mode-hook #'smartparens-mode)
+
+(use-package ruby-mode
+  :config
+  (add-to-list 'auto-mode-alist
+	       '("\\.\\(?:cap\\|gemspec\\|irbrc\\|gemrc\\|rake\\|rb\\|ru\\|thor\\)\\'" . ruby-mode))
+  (add-to-list 'auto-mode-alist
+	       '("\\(?:Brewfile\\|Capfile\\|Gemfile\\(?:\\.[a-zA-Z0-9._-]+\\)?\\|[rR]akefile\\)\\'" . ruby-mode)))
+
+(use-package ruby-electric
+  :config
+  (add-hook 'ruby-mode-hook 'ruby-electric-mode))
+
+(use-package robe
+  :config
+  (eval-after-load 'company '(push 'company-robe company-backends))
+  (global-robe-mode))
+
+(use-package company
+  :config
+  (add-hook 'after-init-hook 'global-company-mode))
+
+(use-package bundler)
+
+(use-package rbenv
+  :config
+  (global-rbenv-mode))
+
+(use-package yaml-mode
+  :config
+  (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
+  (add-hook 'yaml-mode-hook '(lambda () (define-key yaml-mode-map "\C-m" 'newline-and-indent))))
+
+(use-package web-mode
+  :config
+  (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.js?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.jsx?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.css?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.scss?\\'" . web-mode))
+  (add-to-list 'auto-mode-alist '("\\.xml?\\'" . web-mode)))
+
+(use-package projectile
+  :config
+  (projectile-mode +1)
+  (define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
+  (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map))
+
+(use-package projectile-rails
+  :config
+  (projectile-rails-global-mode)
+  (define-key projectile-rails-mode-map (kbd "C-c r") 'projectile-rails-command-map))
+
+;; Extra font lock rules for a more colourful dired.
+(use-package diredfl
+  :ensure t
+  :config
+  (diredfl-global-mode))
+
+(use-package diff-hl
+  :custom-face
+  ;; Change colors for insert, delete and change indicators in diff-hl
+  (diff-hl-insert ((t (:foreground "#a1b56c" :background "#a1b56c"))))
+  (diff-hl-delete ((t (:foreground "#ab4642" :background "#ab4642"))))
+  (diff-hl-change ((t (:foreground "#f7ca88" :background "#f7ca88"))))
+
+  :hook
+  ;; To enable in all Dired buffers.
+  (dired-mode         . diff-hl-dired-mode)
+  ;; diff-hl integration with magit.
+  (magit-pre-refresh  . diff-hl-magit-pre-refresh)
+  (magit-post-refresh . diff-hl-magit-post-refresh)
+
+  :config
+  ;; it modifies 'diff-hl-mode' to use the margin instead of the fringe. The unless condition does this only for terminal.
+  (unless (window-system) (diff-hl-margin-mode))
+  ;; This mode enables diffing on-the-fly.
+  (diff-hl-flydiff-mode)
+  ;; Highlight uncommitted changes using VCHighlight uncommitted changes using VC.
+  (global-diff-hl-mode))
+
+;; A Git porcelain inside Emacs.
+(use-package magit
+  :ensure t
+
+  :commands (magit-add-section-hook magit-section-initial-visibility-alist)
+
+  :init
+  (setq magit-diff-refine-hunk 'all)
+  (setq magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
+
+  :config
+  ;; To list branches and tags directly in your Magit status buffer.
+  (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-local-branches nil t)
+  (add-to-list 'magit-section-initial-visibility-alist '(local . hide))
+  (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-remote-branches nil t)
+  (add-to-list 'magit-section-initial-visibility-alist '(remote . hide))
+  (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-tags nil t)
+  (add-to-list 'magit-section-initial-visibility-alist '(tags . hide)))
+
+;; Emacs-libvterm (vterm) is fully-fledged terminal emulator inside GNU Emacs based on libvterm, a C library.
+(use-package vterm
+  :ensure t
+  :config
+  (define-key vterm-mode-map (kbd "C-q") #'vterm-send-next-key)
+  :custom
+  (vterm-always-compile-module t))
+;; Managing multiple vterm buffers in Emacs.
+(use-package multi-vterm
+  :ensure t)
+
+;; Flycheck is a modern on-the-fly syntax checking extension for GNU Emacs.
+(use-package flycheck
+  :ensure t
+  :init
+  (global-flycheck-mode))
+
+;; Expand region increases the selected region by semantic units. Just keep pressing the key until it selects what you want.
+(use-package expand-region
+  :ensure t
+  :bind
+  ("C-=" . er/expand-region))
+
+(use-package dockerfile-mode
+  :ensure t)
+
+;; Polymode is a framework for multiple major modes (MMM) inside a single Emacs buffer.
+(use-package polymode
+  :ensure t
+
+  :config
+  (with-eval-after-load "polymode"
+    (eieio-oset-default pm-inner-chunkmode :adjust-face -2))
+  (define-innermode poly-dockerfile-innermode
+    :mode 'dockerfile-mode
+    :head-matcher "<<[~-]?\'?DOCKERFILE_?\'?.*\r?\n"
+    :tail-matcher "[ \t]*DOCKERFILE_?.*\r?\n")
+  (define-polymode poly-ruby-mode
+    :hostmode 'poly-ruby-hostmode
+    :innermodes '(poly-dockerfile-innermode))
+  (add-to-list 'auto-mode-alist '("\\.rb" . poly-ruby-mode))
+
+  :hook
+  (poly-ruby-mode . (lambda ()
+		      (setq dockerfile-enable-auto-indent nil))))
+
+;;; init.el ends here

data/lib/smart_machine/grids/terminal/wetty.rb

@@ -0,0 +1,44 @@
+module SmartMachine
+  class Grids
+    class Terminal < SmartMachine::Base
+      class Wetty
+        def initialize(name:, host:, ssh_host:)
+          @name = name
+          @host = host
+          @ssh_host = ssh_host
+        end
+
+        def uper
+          raise "Error: Could not create container: #{@name}" unless system(command.compact.join(' '), out: File::NULL)
+          raise "Error: Could not start container: #{@name}"  unless system("docker start #{@name}", out: File::NULL)
+
+          puts "Created & Started container: #{@name}"
+        end
+
+        def downer
+          raise "Error: Could not stop container: #{@name}"   unless system("docker stop '#{@name}'", out: File::NULL)
+          raise "Error: Could not remove container: #{@name}" unless system("docker rm '#{@name}'", out: File::NULL)
+
+          puts "Stopped & Removed container: #{@name}"
+        end
+
+        private
+
+        def command
+          [
+            'docker create',
+            "--name='#{@name}'",
+            "--env VIRTUAL_HOST=#{@host}",
+            "--env VIRTUAL_PATH=/",
+            "--env LETSENCRYPT_HOST=#{@host}",
+            "--env LETSENCRYPT_EMAIL=#{SmartMachine.config.sysadmin_email}",
+            '--env LETSENCRYPT_TEST=false',
+            "--restart='always'",
+            "--network='nginx-network'",
+            "wettyoss/wetty --base=/ --ssh-host=#{@ssh_host} --ssh-port=2223 --force-ssh=true --title=Terminal"
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/smart_machine/grids/terminal.rb

@@ -0,0 +1,179 @@
+module SmartMachine
+  class Grids
+    class Terminal < SmartMachine::Base
+      def initialize(name:)
+        config = SmartMachine.config.grids.terminal.dig(name.to_sym)
+        raise "terminal config for #{name} not found." unless config
+
+        @image = "smartmachine/terminal:#{SmartMachine.version}"
+        @host = config.dig(:host)
+        @frontend = config.dig(:frontend)
+        @packages = config.dig(:packages)
+        @username = config.dig(:username)
+        @password = config.dig(:password)
+
+        @name = name.to_s
+        @home_dir = File.expand_path('~')
+
+        @wetty = Wetty.new(name: "#{@name}-wetty", host: @host, ssh_host: @name)
+      end
+
+      def installer
+        unless system("docker image inspect #{@image}", [:out, :err] => File::NULL)
+          puts "-----> Creating image #{@image} ... "
+          command = [
+            "docker image build -t #{@image}",
+            "--build-arg SMARTMACHINE_VERSION=#{SmartMachine.version}",
+            "-f- #{SmartMachine.config.gem_dir}/lib/smart_machine/grids/terminal",
+            "<<'EOF'\n#{dockerfile}EOF"
+          ]
+          if system(command.join(" "), out: File::NULL)
+            puts "done"
+          else
+            raise "Error: Could not install image: #{@image}"
+          end
+        else
+          raise "Error: Image already installed: #{@image}. Please uninstall using 'smartmachine grids terminal uninstall' and try installing again."
+        end
+      end
+
+      def uninstaller
+        unless system("docker inspect -f '{{.State.Running}}' '#{@name}'", [:out, :err] => File::NULL)
+          if system("docker image inspect #{@image}", [:out, :err] => File::NULL)
+            puts "-----> Removing image #{@image} ... "
+            if system("docker image rm #{@image}", out: File::NULL)
+              puts "done"
+            end
+          else
+            raise "Error: Terminal already uninstalled. Please install using 'smartmachine grids terminal install' and try uninstalling again."
+          end
+        else
+          raise "Error: Terminal is currently running. Please stop the terminal using 'smartmachine grids terminal down' and try uninstalling again."
+        end
+      end
+
+      def uper
+        if system("docker image inspect #{@image}", [:out, :err] => File::NULL)
+          FileUtils.mkdir_p("#{@home_dir}/machine/grids/terminal/#{@name}/backups")
+
+          # Creating & Starting containers
+          print "-----> Creating container #{@name} ... "
+
+          command = [
+            "docker create",
+            "--name='#{@name}'",
+            "--env VIRTUAL_HOST=#{@host}",
+            "--env VIRTUAL_PATH=#{@frontend}",
+            "--env VIRTUAL_PORT=80",
+            "--env LETSENCRYPT_HOST=#{@host}",
+            "--env LETSENCRYPT_EMAIL=#{SmartMachine.config.sysadmin_email}",
+            "--env LETSENCRYPT_TEST=false",
+            "--env CONTAINER_NAME='#{@name}'",
+            "--env PACKAGES='#{@packages.join(' ')}'",
+            "--env USERNAME=#{@username}",
+            "--env PASSWORD=#{@password}",
+            "--publish='2223:2223'", # TODO: Remove this published port and move it behind the reverse proxy when ready.
+            "--volume='#{@name}-home:/home'",
+            "--volume='#{@home_dir}/smartmachine/grids/terminal/#{@name}/backups:/root/backups'",
+            "--init",
+            "--restart='always'",
+            "--network='nginx-network'",
+            "#{@image}"
+          ]
+          if system(command.compact.join(" "), out: File::NULL)
+            puts "done"
+            puts "-----> Starting container #{@name} ... "
+            if system("docker start #{@name}", out: File::NULL)
+              puts "done"
+
+              @wetty.uper
+            else
+              raise "Error: Could not start container: #{@name}"
+            end
+          else
+            raise "Error: Could not create container: #{@name}"
+          end
+        else
+          raise "Error: Could not find image: #{@image}"
+        end
+      end
+
+      def downer
+        # Stopping & Removing containers - in reverse order
+
+        @wetty.downer
+
+        print "-----> Stopping container #{@name} ... "
+        if system("docker stop '#{@name}'", out: File::NULL)
+          puts "done"
+          print "-----> Removing container #{@name} ... "
+          if system("docker rm '#{@name}'", out: File::NULL)
+            puts "done"
+          end
+        end
+      end
+
+      private
+
+      # openssh-server
+      # sshd needs rsyslog to output /var/log/auth.log.
+      # imklog module is commented in rsyslog.conf because rsyslog does not
+      # have privileges to run it and hence throws error on startup.
+      #
+      # fail2ban
+      # fail2ban needs sshd to output /var/log/auth.log.
+      # Otherwise it cannot start the sshd jail.
+      def dockerfile
+        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 sudo && \
+	      \
+	      apt-get install -y --no-install-recommends rsyslog openssh-server && \
+	      mkdir -p /run/sshd && \
+	      sed -i'.original' '/#Port 22/a Port 2223' /etc/ssh/sshd_config && \
+	      sed -i '/#AddressFamily any/a AddressFamily inet' /etc/ssh/sshd_config && \
+	      sed -i '/#PermitRootLogin prohibit-password/a PermitRootLogin no' /etc/ssh/sshd_config && \
+	      sed -i '/imklog/s/^/#/' /etc/rsyslog.conf && \
+	      \
+	      apt-get install -y --no-install-recommends fail2ban sendmail-bin sendmail && \
+	      cp /etc/fail2ban/fail2ban.conf /etc/fail2ban/fail2ban.local && \
+	      cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local && \
+	      sed -i'.original' 's/destemail = root@localhost/#destemail = root@localhost\ndestemail = %<sysadmin_email>s/' /etc/fail2ban/jail.local && \
+              sed -i 's/action = %<percent>s(action_)s/#action = %<percent>s(action_)s\naction = %<percent>s(action_mwl)s/' /etc/fail2ban/jail.local && \
+	      sed -i 's/port    = ssh/#port    = ssh\nport    = 2223/' /etc/fail2ban/jail.local && \
+	      \
+	      apt-get install -y --no-install-recommends haproxy && \
+	      mkdir -p /run/haproxy && \
+	      mv /etc/haproxy/haproxy.cfg /etc/haproxy/haproxy.cfg.original && \
+	      \
+	      apt-get install -y --no-install-recommends cmake libtool libtool-bin emacs-nox && \
+	      mkdir -p /root/.emacs.d && \
+	      \
+	      apt-get install -y --no-install-recommends vim && \
+	      \
+	      rm -rf /var/lib/apt/lists/* && \
+	      gem install bundler -v 2.1.4
+
+	  COPY haproxy.cfg /etc/haproxy
+	  COPY init.el /root/.emacs.d/init.el
+
+	  COPY entrypoint.rb /usr/local/bin/entrypoint.rb
+	  RUN chmod +x /usr/local/bin/entrypoint.rb
+	  ENTRYPOINT ["entrypoint.rb"]
+
+	  EXPOSE 2223 80
+	  STOPSIGNAL SIGUSR1
+	  CMD ["haproxy", "-W", "-db", "-f", "/etc/haproxy/haproxy.cfg"]
+        DOCKERFILE
+
+        format(file, "sysadmin_email": SmartMachine.config.sysadmin_email, "percent": '%')
+      end
+    end
+  end
+end

data/lib/smart_machine/machine.rb

@@ -49,11 +49,6 @@ module SmartMachine
       puts "New machine #{name} has been created."
     end
 
-    def initial_setup
-      getting_started
-      securing_your_server
-    end
-
     def run_on_machine(commands:)
       commands = Array(commands).flatten
       ssh = SmartMachine::SSH.new
@@ -62,9 +57,35 @@ module SmartMachine
       status[:exit_code] == 0
     end
 
+    def setup
+      getting_started
+      securing_your_server
+    end
+
     private
 
     def getting_started
+      run_on_machine(commands: "sudo apt update && sudo apt upgrade")
+
+      sysctl_lines = []
+      # sysctl_lines.push('# KVM uses this.')
+      # sysctl_lines.push('# These lines should only be activated for VM hosts and not for VM guests.')
+      # sysctl_lines.push('# When getting a VM from a service provider, you will usually get a VM guest and not a VM host and hence these lines should not be added.')
+      # sysctl_lines.push('# Prevent bridged traffic from being processed by iptables rules.')
+      # sysctl_lines.push('net.bridge.bridge-nf-call-ip6tables=0')
+      # sysctl_lines.push('net.bridge.bridge-nf-call-iptables=0')
+      # sysctl_lines.push('net.bridge.bridge-nf-call-arptables=0')
+      sysctl_lines.push('# Redis uses this.')
+      sysctl_lines.push('vm.overcommit_memory=1')
+      sysctl_lines.push('# Elasticsearch uses this.')
+      sysctl_lines.push('vm.max_map_count=262144')
+      commands = [
+        "sudo touch /etc/sysctl.d/99-smartmachine.conf",
+        "echo -e '#{sysctl_lines.join('\n')}' | sudo tee /etc/sysctl.d/99-smartmachine.conf",
+        "sudo sysctl -p /etc/sysctl.d/99-smartmachine.conf"
+      ]
+      run_on_machine(commands: commands)
+
       # apt install locales-all
 
       # puts 'You may be prompted to make a menu selection when the Grub package is updated on Ubuntu. If prompted, select keep the local version currently installed.'

data/lib/smart_machine/syncer.rb

@@ -44,7 +44,7 @@ module SmartMachine
         "-e 'ssh -p #{SmartMachine.credentials.machine[:port]}'",
         "--rsync-path='smartengine syncer rsync'",
         "--delete",
-        "--include={#{files_list}}",
+        files_list.map { |regex| "--include='#{regex}'" }.join(" "),
         "--exclude=*"
       ]
 
@@ -68,6 +68,9 @@ module SmartMachine
         'grids/mysql',
         'grids/mysql/***',
 
+        'grids/nextcloud',
+        'grids/nextcloud/***',
+
         'grids/nginx',
         'grids/nginx/certificates/***',
 
@@ -77,13 +80,13 @@ module SmartMachine
         'grids/redis',
         'grids/redis/***',
 
-        'grids/scheduler',
-        'grids/scheduler/crontabs/***',
-
         'grids/solr',
         'grids/solr/solr/***',
+
+        'grids/terminal',
+        'grids/terminal/***',
       ]
-      files.join(',')
+      files
     end
 
     def push_files_list
@@ -105,8 +108,10 @@ module SmartMachine
         'config/elasticsearch.yml',
         'config/minio.yml',
         'config/mysql.yml',
+        'config/nextcloud.yml',
         'config/prereceiver.yml',
         'config/redis.yml',
+        'config/terminal.yml',
 
         'grids',
 
@@ -117,17 +122,13 @@ module SmartMachine
         'grids/nginx/fastcgi.conf',
         'grids/nginx/nginx.tmpl',
 
-        'grids/scheduler',
-        'grids/scheduler/crontabs',
-        'grids/scheduler/crontabs/.keep',
-
         'grids/solr',
         'grids/solr/solr',
         'grids/solr/solr/.keep',
 
         'tmp/***',
       ]
-      files.join(',')
+      files
     end
   end
 end

data/lib/smart_machine/templates/dotsmartmachine/config/nextcloud.yml

@@ -0,0 +1,27 @@
+nextcloudone:
+  image: "nextcloud:25.0.1-apache"
+  host: "yournextcloudone.yourdomain.com"
+  admin_user: <%= SmartMachine.credentials.dig(:nextcloudone, :admin_user) %>
+  admin_password: <%= SmartMachine.credentials.dig(:nextcloudone, :admin_password) %>
+  mysql_host: mysqlone
+  mysql_port: 3306
+  mysql_user: <%= SmartMachine.credentials.dig(:nextcloudone, :mysql_user) %>
+  mysql_password: <%= SmartMachine.credentials.dig(:nextcloudone, :mysql_password) %>
+  mysql_database_name: <%= SmartMachine.credentials.dig(:nextcloudone, :mysql_database_name) %>
+  redis_host: redisone
+  redis_port: 6379
+  redis_password: <%= SmartMachine.credentials.dig(:redisone, :password) %>
+
+# nextcloudtwo:
+#   image: "nextcloud:25.0.1-apache"
+#   host: "yournextcloudtwo.yourdomain.com"
+#   admin_user: <%= SmartMachine.credentials.dig(:nextcloudtwo, :admin_user) %>
+#   admin_password: <%= SmartMachine.credentials.dig(:nextcloudtwo, :admin_password) %>
+#   mysql_host: mysqlone
+#   mysql_port: 3306
+#   mysql_user: <%= SmartMachine.credentials.dig(:nextcloudtwo, :mysql_user) %>
+#   mysql_password: <%= SmartMachine.credentials.dig(:nextcloudtwo, :mysql_password) %>
+#   mysql_database_name: <%= SmartMachine.credentials.dig(:nextcloudtwo, :mysql_database_name) %>
+#   redis_host: redistwo
+#   redis_port: 6380
+#   redis_password: <%= SmartMachine.credentials.dig(:redistwo, :password) %>