smartmachine 1.0.1 → 1.1.1

data/lib/smart_machine/version.rb

@@ -16,7 +16,7 @@ module SmartMachine
 
   module VERSION
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     TINY  = 1
     PRE   = nil
 
@@ -26,7 +26,7 @@ module SmartMachine
   module RUBY_VERSION
     MAJOR = 2
     MINOR = 7
-    TINY  = 0
+    TINY  = 7
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/smart_machine.rb

@@ -25,11 +25,13 @@ require 'smart_machine/buildpackers/rails'
 require 'smart_machine/grids/elasticsearch'
 require 'smart_machine/grids/minio'
 require 'smart_machine/grids/mysql'
+require 'smart_machine/grids/nextcloud'
 require 'smart_machine/grids/nginx'
 require 'smart_machine/grids/prereceiver'
 require 'smart_machine/grids/redis'
-# require 'smart_machine/grids/scheduler'
 # require 'smart_machine/grids/solr'
+require 'smart_machine/grids/terminal/wetty'
+require 'smart_machine/grids/terminal'
 
 module SmartMachine
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartmachine
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - plainsource
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2023-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -24,6 +24,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +173,6 @@ files:
 - lib/smart_machine/base.rb
 - lib/smart_machine/buildpackers/buildpacker.rb
 - lib/smart_machine/buildpackers/rails.rb
-- lib/smart_machine/buildpackers/rails/Dockerfile
 - lib/smart_machine/commands.rb
 - lib/smart_machine/commands/app.rb
 - lib/smart_machine/commands/buildpacker.rb
@@ -144,11 +183,12 @@ files:
 - lib/smart_machine/commands/grid_commands/elasticsearch.rb
 - lib/smart_machine/commands/grid_commands/minio.rb
 - lib/smart_machine/commands/grid_commands/mysql.rb
+- lib/smart_machine/commands/grid_commands/nextcloud.rb
 - lib/smart_machine/commands/grid_commands/nginx.rb
 - lib/smart_machine/commands/grid_commands/prereceiver.rb
 - lib/smart_machine/commands/grid_commands/redis.rb
-- lib/smart_machine/commands/grid_commands/scheduler.rb
 - lib/smart_machine/commands/grid_commands/sub_thor.rb
+- lib/smart_machine/commands/grid_commands/terminal.rb
 - lib/smart_machine/commands/machine.rb
 - lib/smart_machine/commands/syncer.rb
 - lib/smart_machine/commands/utilities.rb
@@ -156,30 +196,17 @@ files:
 - lib/smart_machine/credentials.rb
 - lib/smart_machine/docker.rb
 - lib/smart_machine/engine.rb
-- lib/smart_machine/engine/Dockerfile
 - lib/smart_machine/grids/elasticsearch.rb
-- lib/smart_machine/grids/elasticsearch/.keep
 - lib/smart_machine/grids/minio.rb
-- lib/smart_machine/grids/minio/.keep
 - lib/smart_machine/grids/mysql.rb
 - lib/smart_machine/grids/mysql/docker-entrypoint-initdb.d/.keep
+- lib/smart_machine/grids/nextcloud.rb
 - lib/smart_machine/grids/nginx.rb
-- lib/smart_machine/grids/nginx/.keep
 - lib/smart_machine/grids/prereceiver.rb
 - lib/smart_machine/grids/prereceiver/Dockerfile
-- lib/smart_machine/grids/prereceiver/fcgiwrap/APKBUILD
-- lib/smart_machine/grids/prereceiver/fcgiwrap/fcgiwrap.confd
-- lib/smart_machine/grids/prereceiver/fcgiwrap/fcgiwrap.initd
-- lib/smart_machine/grids/prereceiver/fcgiwrap/fcgiwrap.pre-install
-- lib/smart_machine/grids/prereceiver/fcgiwrap/packages/main/x86_64/APKINDEX.tar.gz
-- lib/smart_machine/grids/prereceiver/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.apk
-- lib/smart_machine/grids/prereceiver/fcgiwrap/packages/main/x86_64/fcgiwrap-doc-1.1.1-r4.apk
-- lib/smart_machine/grids/prereceiver/fcgiwrap/packages/main/x86_64/fcgiwrap-openrc-1.1.1-r4.apk
 - lib/smart_machine/grids/prereceiver/pre-receive
 - lib/smart_machine/grids/redis.rb
-- lib/smart_machine/grids/redis/.keep
-- lib/smart_machine/grids/scheduler.rb
-- lib/smart_machine/grids/scheduler/Dockerfile
+- lib/smart_machine/grids/redmine.rb
 - lib/smart_machine/grids/solr.rb
 - lib/smart_machine/grids/solr/config/.keep
 - lib/smart_machine/grids/solr/config/README.txt
@@ -344,6 +371,11 @@ files:
 - lib/smart_machine/grids/solr/docker-entrypoint-initdb.d/.keep
 - lib/smart_machine/grids/solr/sunspot/conf/schema.xml
 - lib/smart_machine/grids/solr/sunspot/conf/solrconfig.xml
+- lib/smart_machine/grids/terminal.rb
+- lib/smart_machine/grids/terminal/entrypoint.rb
+- lib/smart_machine/grids/terminal/haproxy.cfg
+- lib/smart_machine/grids/terminal/init.el
+- lib/smart_machine/grids/terminal/wetty.rb
 - lib/smart_machine/logger.rb
 - lib/smart_machine/machine.rb
 - lib/smart_machine/scp.rb
@@ -357,15 +389,16 @@ files:
 - lib/smart_machine/templates/dotsmartmachine/config/minio.yml
 - lib/smart_machine/templates/dotsmartmachine/config/mysql.yml
 - lib/smart_machine/templates/dotsmartmachine/config/mysql/schedule.rb
+- lib/smart_machine/templates/dotsmartmachine/config/nextcloud.yml
 - lib/smart_machine/templates/dotsmartmachine/config/prereceiver.yml
 - lib/smart_machine/templates/dotsmartmachine/config/redis.yml
+- lib/smart_machine/templates/dotsmartmachine/config/terminal.yml
 - lib/smart_machine/templates/dotsmartmachine/config/users.yml
 - lib/smart_machine/templates/dotsmartmachine/gitignore-template
 - lib/smart_machine/templates/dotsmartmachine/grids/nginx/certificates/.keep
 - lib/smart_machine/templates/dotsmartmachine/grids/nginx/fastcgi.conf
 - lib/smart_machine/templates/dotsmartmachine/grids/nginx/htpasswd/.keep
 - lib/smart_machine/templates/dotsmartmachine/grids/nginx/nginx.tmpl
-- lib/smart_machine/templates/dotsmartmachine/grids/scheduler/crontabs/.keep
 - lib/smart_machine/templates/dotsmartmachine/grids/solr/solr/.keep
 - lib/smart_machine/templates/dotsmartmachine/tmp/.keep
 - lib/smart_machine/templates/dotsmartmachine/vendor/.keep
@@ -376,8 +409,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/plainsource/smartmachine
   bug_tracker_uri: https://github.com/plainsource/smartmachine/issues
-  changelog_uri: https://github.com/plainsource/smartmachine/releases/tag/v1.0.1
-  source_code_uri: https://github.com/plainsource/smartmachine/tree/v1.0.1
+  changelog_uri: https://github.com/plainsource/smartmachine/releases/tag/v1.1.1
+  source_code_uri: https://github.com/plainsource/smartmachine/tree/v1.1.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -386,14 +419,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.7.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Full-stack deployment framework for Rails.

data/lib/smart_machine/buildpackers/rails/Dockerfile

@@ -1,21 +0,0 @@
-ARG SMARTMACHINE_VERSION
-
-FROM smartmachine/smartengine:$SMARTMACHINE_VERSION
-LABEL maintainer="plainsource <plainsource@humanmind.me>"
-
-# Ruby on Rails Essentials
-RUN apk add --update build-base && \
-	apk add --update tzdata && \
-	apk add --update nodejs && \
-	apk add --update yarn && \
-	apk add --update mariadb-dev && \
-	apk add --update imagemagick && \
-	apk add --update ffmpeg && \
-	apk add --update mupdf && \
-	apk add --update mupdf-tools && \
-    rm -rf /var/cache/apk/*
-
-# Gems
-RUN gem install bundler -v 2.1.4
-
-CMD ["smartmachine", "buildpacker", "packer", "rails"]

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

@@ -1,15 +0,0 @@
-module SmartMachine
-  module Commands
-    module GridCommands
-      class Scheduler < SubThor
-        include Utilities
-
-        # def start
-        # end
-
-        # def stop
-        # end
-      end
-    end
-  end
-end

data/lib/smart_machine/engine/Dockerfile

@@ -1,30 +0,0 @@
-FROM ruby:2.7.0-alpine3.11
-LABEL maintainer="plainsource <plainsource@humanmind.me>"
-
-# User
-# --- Fix to change docker gid to 998 (if it is in use) so that addgroup is free to create a group with docker gid.
-ARG USER_NAME
-ARG USER_UID
-ARG DOCKER_GID
-ARG DOCKER_GNAME
-RUN sed -i "s/$DOCKER_GID/998/" /etc/group && \
-	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME" && \
-	addgroup --gid "$DOCKER_GID" "$DOCKER_GNAME" && adduser "$USER_NAME" "$DOCKER_GNAME"
-
-# Essentials
-RUN apk add --update build-base && \
-	apk add --update xz && \
-	apk add --update docker && \
-	apk add --update git && \
-	apk add --update rsync && \
-    rm -rf /var/cache/apk/*
-
-# smartmachine gem
-ARG SMARTMACHINE_VERSION
-COPY ./smartmachine-$SMARTMACHINE_VERSION.gem ./smartmachine-$SMARTMACHINE_VERSION.gem
-RUN gem install --no-document ./smartmachine-$SMARTMACHINE_VERSION.gem && \
-	rm ./smartmachine-$SMARTMACHINE_VERSION.gem
-
-# smartmachine master key
-ARG SMARTMACHINE_MASTER_KEY
-ENV SMARTMACHINE_MASTER_KEY=$SMARTMACHINE_MASTER_KEY

data/lib/smart_machine/grids/prereceiver/fcgiwrap/APKBUILD

@@ -1,49 +0,0 @@
-# Contributor: Eivind Uggedal <eu@eju.no>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=fcgiwrap
-#pkgver=1.1.0
-pkgver=1.1.1
-#pkgrel=3
-pkgrel=4
-pkgdesc="Simple server for running CGI applications over FastCGI"
-# This url has been changed to add no_buffering feature for fcgiwrap where has not been currently merged by gnosek
-#url="https://github.com/gnosek/fcgiwrap"
-url="https://github.com/notr1ch/fcgiwrap"
-arch="all"
-license="MIT"
-pkgusers="fcgiwrap"
-pkggroups="www-data"
-install="$pkgname.pre-install"
-makedepends="$depends_dev autoconf libtool automake fcgi-dev"
-subpackages="$pkgname-doc $pkgname-openrc"
-# This source has been changed to add no_buffering feature for fcgiwrap where has not been currently merged by gnosek. Please note the use of master branch instead of $pkgver.
-#source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/$pkgname/archive/$pkgver.tar.gz
-source="$pkgname-$pkgver.tar.gz::https://github.com/notr1ch/$pkgname/archive/master.tar.gz
-	$pkgname.initd
-	$pkgname.confd"
-
-#builddir="$srcdir/$pkgname-$pkgver"
-builddir="$srcdir/$pkgname-master"
-
-build() {
-	cd "$builddir"
-	autoreconf --install
-	CFLAGS="$CFLAGS -Wno-implicit-fallthrough" \
-	./configure --prefix=/usr \
-		--mandir=/share/man \
-		--sbindir=/bin
-	make
-}
-
-package() {
-	cd "$builddir"
-	install -d -m2775 -o fcgiwrap -g www-data  "$pkgdir"/run/fcgiwrap
-	make DESTDIR="$pkgdir" install
-	install -Dm755 $srcdir/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -Dm644 $srcdir/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-
-sha512sums="4ffacd247f48ff0827531da1e9fbf19262d51827668d90cde1ec30ea23139cdf6f45a3b2a955a2a3b8e9ddbc85e7e4fa4dd18217e71288441c8cabdff5c24846  fcgiwrap-1.1.1.tar.gz
-0dbf5f4387e5dc5de6e9bd6d98247e175f1a7943fe1d04ea916881b1269fd0b62abfafac91f8c0dd2f4dc9c71118195ba9dd7cf9bb5e3d93e6e711ec7d770453  fcgiwrap.initd
-893e9afa92c20c9d0dab68fffc806a1be1f2e28a7e73bbb497316386a9ee083be4bad68a90f660e489311a9812a512b50fb0edb8b9c49b12f6cd266ba53b01a6  fcgiwrap.confd"

data/lib/smart_machine/grids/prereceiver/fcgiwrap/fcgiwrap.confd

@@ -1,6 +0,0 @@
-# set number of preforked children. defaults to number of system CPUs
-#nproc=$(nproc)
-
-# set listen socket. Defaults to unix:/run/fcgiwrap/fcgiwrap.sock
-#socket=unix:/run/fcgiwrap/fcgiwrap.sock
-

data/lib/smart_machine/grids/prereceiver/fcgiwrap/fcgiwrap.initd

@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-
-name="fcgiwrap"
-description="fcgiwrap cgi daemon"
-
-command="/usr/bin/fcgiwrap"
-command_background="yes"
-user="fcgiwrap"
-group="www-data"
-: ${socket:=unix:/run/fcgiwrap/fcgiwrap.sock}
-
-depend() {
-	need net localmount
-	after firewall
-}
-
-start_pre() {
-	command_args="-c ${nproc:-$(nproc)} -s $socket"
-	case "$socket" in
-	unix:/*)
-		local socket_path=${socket#unix:}
-		checkpath --directory --mode 2775 --owner ${user}:${group} \
-			${socket_path%/*}
-		;;
-	esac
-}
-
-start() {
-	ebegin "Starting ${name}"
-	start-stop-daemon --exec ${command} \
-		--background \
-		-u ${user} -g ${group} \
-		--start -- ${command_args}
-	eend $?
-}
-
-stop_post() {
-	case "$socket" in
-	unix:/*)
-		rm -f "${socket#unix:}"
-		;;
-	esac
-}

data/lib/smart_machine/grids/prereceiver/fcgiwrap/fcgiwrap.pre-install

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-addgroup -S www-data 2>/dev/null
-adduser -S -D -H -h /var/run/fcgiwrap -s /sbin/nologin -G www-data \
-	fcgiwrap 2>/dev/null
-exit 0
-

data/lib/smart_machine/grids/scheduler/Dockerfile

@@ -1,14 +0,0 @@
-ARG SMARTMACHINE_VERSION
-
-FROM smartmachine:$SMARTMACHINE_VERSION
-LABEL maintainer="plainsource <plainsource@humanmind.me>"
-
-# Scheduler Essentials
-RUN apk add --update busybox-suid && \
-	apk add --update bash && \
-    rm -rf /var/cache/apk/*
-
-# Gems
-RUN gem install whenever -v 1.0.0
-
-CMD ["crond", "-f", "-l", "0", "-L", "/dev/stdout"]

data/lib/smart_machine/grids/scheduler.rb

@@ -1,188 +0,0 @@
-# The main SmartMachine Grids Scheduler driver
-module SmartMachine
-	class Grids
-		class Scheduler < SmartMachine::Base
-
-			def initialize
-			end
-
-			def install
-				puts "-----> Installing Scheduler"
-
-				ssh = SmartMachine::SSH.new
-				commands = ["smartmachine runner scheduler create"]
-				ssh.run commands
-
-				puts "-----> Scheduler Installation Complete"
-			end
-
-			def uninstall
-				puts "-----> Uninstalling Scheduler"
-
-				ssh = SmartMachine::SSH.new
-				commands = ["smartmachine runner scheduler destroy"]
-				ssh.run commands
-
-				puts "-----> Scheduler Uninstallation Complete"
-			end
-
-			def update
-				uninstall
-				install
-			end
-
-			def create
-				unless system("docker image inspect #{scheduler_image_name}", [:out, :err] => File::NULL)
-					print "-----> Creating image #{scheduler_image_name} ... "
-					if system("docker image build -t #{scheduler_image_name} \
-									--build-arg SMARTMACHINE_VERSION=#{SmartMachine.version} \
-									#{SmartMachine.config.root_path}/lib/smart_machine/grids/scheduler", out: File::NULL)
-						puts "done"
-
-						up
-					end
-				end
-			end
-
-			def destroy
-				down
-
-				if system("docker image inspect #{scheduler_image_name}", [:out, :err] => File::NULL)
-					print "-----> Removing image #{scheduler_image_name} ... "
-					if system("docker image rm #{scheduler_image_name}", out: File::NULL)
-						puts "done"
-					end
-				end
-			end
-
-			def up
-				if SmartMachine::Docker.running?
-					if system("docker image inspect #{scheduler_image_name}", [:out, :err] => File::NULL)
-						print "-----> Creating container scheduler with image #{scheduler_image_name} ... "
-						if system("docker create \
-							--name='scheduler' \
-							--env MAILTO=#{SmartMachine.config.sysadmin_email} \
-							--user `id -u` \
-							--workdir /home/`id -un`/.smartmachine \
-							--volume='#{SmartMachine.config.user_home_path}/.smartmachine/config:#{SmartMachine.config.user_home_path}/.smartmachine/config' \
-							--volume='#{SmartMachine.config.user_home_path}/.smartmachine/grids/scheduler:#{SmartMachine.config.user_home_path}/.smartmachine/grids/scheduler' \
-							--volume='#{SmartMachine.config.user_home_path}/.smartmachine/bin/smartmachine.sh:/usr/local/bundle/bin/smartmachine' \
-							--volume='/var/run/docker.sock:/var/run/docker.sock:ro' \
-							--restart='always' \
-							#{scheduler_image_name}", out: File::NULL)
-							puts "done"
-
-							print "-----> Starting container scheduler with image #{scheduler_image_name} ... "
-							if system("docker start scheduler", out: File::NULL)
-								puts "done"
-
-								restore_crontabs
-							else
-								puts "error"
-							end
-						end
-					end
-				end
-			end
-	
-			def down
-				if SmartMachine::Docker.running?
-					# Stopping & Removing containers - in reverse order
-					if system("docker inspect -f '{{.State.Running}}' 'scheduler'", [:out, :err] => File::NULL)
-						print "-----> Stopping container scheduler with image #{scheduler_image_name} ... "
-						if system("docker stop 'scheduler'", out: File::NULL)
-							puts "done"
-
-							print "-----> Removing container scheduler with image #{scheduler_image_name} ... "
-							if system("docker rm 'scheduler'", out: File::NULL)
-								puts "done"
-							end
-						end
-					else
-						puts "-----> Container 'scheduler' is currently not running."
-					end
-				end
-			end
-
-
-			def start(*args)
-				args.flatten!
-				type = args.empty? ? '--all' : args.shift
-
-				self.class.running!
-
-				if type == '--mysql'
-					system("docker exec -i scheduler sh -c 'exec scheduler start --mysql'")
-				end
-			end
-
-			def stop(*args)
-				args.flatten!
-				type = args.empty? ? '--all' : args.shift
-
-				self.class.running!
-
-				if type == '--mysql'
-					system("docker exec -i scheduler sh -c 'exec scheduler stop --mysql'")
-				end
-			end
-
-			def mysql(*args)
-				args.flatten!
-				action = args.empty? ? '' : args.shift
-
-				return unless ['start', 'stop'].include? action
-
-				command = "whenever --set 'output=#{SmartMachine.config.user_home_path}/.smartmachine/grids/scheduler/crontabs/crontabs.log' --load-file #{SmartMachine.config.user_home_path}/.smartmachine/config/mysql/schedule.rb"
-
-				if action == 'start'
-					command += " --update-crontab"
-					action_text = "Starting"
-				elsif action == 'stop'
-					command += " --clear-crontab"
-					action_text = "Stopping"
-				end
-
-				print "-----> #{action_text} automatic backup schedule for mysql ... "
-				if system(command, out: File::NULL)
-					puts "done"
-				else
-					puts "error"
-				end
-			ensure
-				backup_crontabs
-			end
-
-			def scheduler_image_name
-				"smartmachine/scheduler:#{SmartMachine.version}"
-			end
-
-			def restore_crontabs
-				if system("docker exec scheduler sh -c 'exec test -f #{SmartMachine.config.user_home_path}/.smartmachine/grids/scheduler/crontabs/`id -un`'")
-					print "-----> Restoring latest crontabs ... "
-
-					if system("docker exec scheduler sh -c 'exec crontab - < #{SmartMachine.config.user_home_path}/.smartmachine/grids/scheduler/crontabs/`id -un`'")
-						puts "done"
-					else
-						puts "error"
-					end
-				end
-			end
-
-			def backup_crontabs
-				print "-----> Backing up latest crontabs ... "
-				if system("crontab -l > #{SmartMachine.config.user_home_path}/.smartmachine/grids/scheduler/crontabs/`id -un`", out: File::NULL)
-					puts "done"
-				else
-					puts "error"
-				end
-			end
-
-			def self.running!
-				unless system("docker inspect -f '{{.State.Running}}' 'scheduler'", [:out, :err] => File::NULL)
-					raise "Scheduler is not running. Please start scheduler before scheduling"
-				end
-			end
-		end
-	end
-end