smartmachine 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 833d8ed724136d6baf6c1fadd3e0fe8522d52560b5e6688726724b38e81b707f
-  data.tar.gz: b58f169a8a460527a819dc15d3cbdc701ba27ef14e5f630065fcff9b1b51e9b8
+  metadata.gz: 399cf5ca8bd944f129d3731d93be76cf46ba86e3f25b97b5110ee42dc8650430
+  data.tar.gz: 2b0166c466312def05a5ee8930bf3943c0f31e3a224d582caeee878c68e43a8d
 SHA512:
-  metadata.gz: af4e6122341a3c96a3afe4076734c84e10e912872f7cc7288aeb771b6349161a91f6746cd9131f42cab30b70b935d1ed998d2c3166439decae3a1f03131512c7
-  data.tar.gz: 0ad34213b75873b2cd7f9b3b61566b13a7ba804955ce18185adac6ce71869f3f3e5e857e47d5e049e557f1a624d0c62e487f7fe4db12be230355811769d413e3
+  metadata.gz: e1f029f440a058a7185f315137f2e2544fb3898ef21d3bffb7792f50350d1b7d476c3c116d7ebec2790a2fb8f0c11cc1151558b6fc42db37edfdf55688bb8f4d
+  data.tar.gz: d667cfb03e650d7f9497a6be4b816b3c2eb0c70e85760987746fdd083d9f2bc3496b48ff1d65df667934e6065b8dfa5355e27c48820bc72cfb3e578506c4267e

data/README.md

@@ -65,6 +65,11 @@ Install the engine and buildpacker:
 
 ## Usage
 
+### Setup your Network
+
+    $ smartmachine machine network up
+    $ smartmachine machine network down
+
 ### Choose Your Grids
 
 Choose only the grids you need. You can start or stop a grid at anytime using <b>up</b> or <b>down</b> commands respectively.

data/lib/smart_machine/apps/container.rb

@@ -33,10 +33,11 @@ module SmartMachine
           "--volume='#{@home_dir}/smartmachine/apps/containers/#{@appname}/app/public/packs:/app/public/packs'",
           "--volume='#{@home_dir}/smartmachine/apps/containers/#{@appname}/app/node_modules:/app/node_modules'",
           "--volume='#{@home_dir}/smartmachine/apps/containers/#{@appname}/app/storage:/app/storage'",
+          (using_buildpacker ? "--cpus=1 --memory=512m --memory-swap=1024m" : nil),
           "--restart='always'",
           "--init",
           # "--network='nginx-network'",
-          "#{using_buildpacker ? "smartmachine/buildpackers/rails:#{SmartMachine.version}" : @appimage}"
+          (using_buildpacker ? "smartmachine/buildpackers/rails:#{SmartMachine.version}" : @appimage)
         ]
         command.push(using_command) if using_command.present?
 

data/lib/smart_machine/buildpackers/buildpacker.rb

@@ -80,13 +80,9 @@ module SmartMachine
                 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 \
@@ -95,7 +91,7 @@ module SmartMachine
 		  poppler-utils && \
               rm -rf /var/lib/apt/lists/* && \
               # ImageMagick 7. Remove this after its dependency is gone from ruby on rails.
-              cd /opt && wget https://download.imagemagick.org/archive/ImageMagick-7.1.1-29.tar.gz && \
+              cd /opt && wget https://download.imagemagick.org/archive/releases/ImageMagick-7.1.1-29.tar.gz && \
                 tar xvzf ImageMagick-7.1.1-29.tar.gz && \
                 cd ImageMagick-7.1.1-29 && \
                 ./configure && \
@@ -109,44 +105,6 @@ module SmartMachine
 
         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
-      # 	unless system("sudo swapon -s | grep -ci '/swapfile'", out: File::NULL)
-      # 		print "-----> Creating swap swapfile ... "
-      # 		system("sudo install -o root -g root -m 0600 /dev/null /swapfile", out: File::NULL)
-      # 		system("sudo dd if=/dev/zero of=/swapfile bs=1k count=2048k", [:out, :err] => File::NULL)
-      # 		system("sudo mkswap /swapfile", out: File::NULL)
-      # 		system("sudo sh -c 'echo \"/swapfile       none    swap    sw      0       0\" >> /etc/fstab'", out: File::NULL)
-      # 		system("echo 10 | sudo tee /proc/sys/vm/swappiness", out: File::NULL)
-      # 		system("sudo sed -i '/^vm.swappiness = /d' /etc/sysctl.conf", out: File::NULL)
-      # 		system("echo vm.swappiness = 10 | sudo tee -a /etc/sysctl.conf", out: File::NULL)
-      # 		puts "done"
-      #
-      # 		print "-----> Starting swap swapfile ... "
-      # 		if system("sudo swapon /swapfile", out: File::NULL)
-      # 			puts "done"
-      # 		end
-      # 	end
-      # end
-      #
-      # def self.destroy_swapfile
-      # 	if system("sudo swapon -s | grep -ci '/swapfile'", out: File::NULL)
-      # 		print "-----> Stopping swap swapfile ... "
-      # 		if system("sudo swapoff /swapfile", out: File::NULL)
-      # 			system("sudo sed -i '/^vm.swappiness = /d' /etc/sysctl.conf", out: File::NULL)
-      # 			system("echo 60 | sudo tee /proc/sys/vm/swappiness", out: File::NULL)
-      # 			puts "done"
-      #
-      # 			print "-----> Removing swap swapfile ... "
-      # 			system("sudo sed -i '/^\\/swapfile/d' /etc/fstab", out: File::NULL)
-      # 			if system("sudo rm /swapfile", out: File::NULL)
-      # 				puts "done"
-      # 			end
-      # 		end
-      # 	end
-      # end
     end
   end
 end

data/lib/smart_machine/buildpackers/rails.rb

@@ -173,6 +173,66 @@ module SmartMachine
         system("alias bundler='bundler _#{bundler_version}_'")
         logger.info "Using bundler v" + bundler_version + "\n"
 
+        # Install nodejs
+        nodejs_version = `sed -n '/node/{p;n}' package.json`.strip.split(":").last&.strip&.delete_prefix('"')&.delete_suffix(',')&.delete_suffix('"')
+        if nodejs_version.nil? || nodejs_version.empty?
+          logger.error "Could not find nodejs version. Have you specified it explicitly in package.json with engines field and run yarn install?\n"
+          return false
+        end
+
+        unless system(user_bash("node -v"), [:out, :err] => File::NULL) && `#{user_bash('node -v')}`.strip&.delete_prefix('v') == nodejs_version
+          logger.info "Installing nodejs v#{nodejs_version}\n"
+
+          Open3.popen2e(user_bash("asdf plugin add nodejs https://github.com/asdf-vm/asdf-nodejs.git")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf plugin update nodejs")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf install nodejs #{nodejs_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf local nodejs #{nodejs_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+
+          unless `#{user_bash('node -v')}`.strip&.delete_prefix('v') == nodejs_version
+            logger.error "Could not install nodejs with version #{nodejs_version}. Please try another valid version that asdf supports.\n"
+            return false
+          end
+        end
+        logger.info "Using nodejs v" + `#{user_bash('node -v')}`.strip&.delete_prefix('v') + "\n"
+
+        # Install yarn
+        yarn_version = `sed -n '/yarn/{p;n}' package.json`.strip.split(":").last&.strip&.delete_prefix('"')&.delete_suffix(',')&.delete_suffix('"')
+        if yarn_version.nil? || yarn_version.empty?
+          logger.error "Could not find yarn version. Have you specified it explicitly in package.json with engines field and run yarn install?\n"
+          return false
+        end
+
+        unless system(user_bash("yarn -v"), [:out, :err] => File::NULL) && `#{user_bash('yarn -v')}`.strip == yarn_version
+          logger.info "Installing yarn v#{yarn_version}\n"
+
+          Open3.popen2e(user_bash("asdf plugin add yarn https://github.com/twuni/asdf-yarn.git")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf plugin update yarn")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf install yarn #{yarn_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+          Open3.popen2e(user_bash("asdf local yarn #{yarn_version}")) do |stdin, stdout_and_stderr, wait_thr|
+            stdout_and_stderr.each { |line| logger.info "#{line}" }
+          end
+
+          unless `#{user_bash('yarn -v')}`.strip == yarn_version
+            logger.error "Could not install yarn with version #{yarn_version}. Please try another valid version that asdf supports.\n"
+            return false
+          end
+        end
+        logger.info "Using yarn v" + `#{user_bash('yarn -v')}`.strip + "\n"
+
         set_logger_formatter_arrow
 
         return true

data/lib/smart_machine/machine.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require "net/ssh"
 
 module SmartMachine
@@ -60,36 +61,23 @@ module SmartMachine
     def setup
       getting_started
       securing_your_server
+      setup_services
     end
 
     private
 
     def getting_started
-      run_on_machine(commands: "sudo apt update && sudo apt upgrade")
+    end
 
-      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)
+    def securing_your_server
+      # apt update && apt upgrade
+      # puts 'When updating some packages, you may be prompted to use updated configuration files. If prompted, it is typically safer to keep the locally installed version.'
 
       # 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.'
-      # apt update && apt upgrade
+
+      # dpkg-reconfigure tzdata
+      # date
 
       # hostnamectl set-hostname SmartMachine.credentials.machine[:name]
 
@@ -99,24 +87,6 @@ module SmartMachine
       # 203.0.113.10 SmartMachine.credentials.machine[:name].example.com SmartMachine.credentials.machine[:name]
       # 2600:3c01::a123:b456:c789:d012 SmartMachine.credentials.machine[:name].example.com SmartMachine.credentials.machine[:name]
 
-      # dpkg-reconfigure tzdata
-      # date
-    end
-
-    def securing_your_server
-      # apt install unattended-upgrades
-      # dpkg-reconfigure --priority=low unattended-upgrades
-
-      # nano /etc/apt/apt.conf.d/20auto-upgrades
-      # APT::Periodic::Update-Package-Lists "1";
-      # APT::Periodic::Download-Upgradeable-Packages "1";
-      # APT::Periodic::AutocleanInterval "7";
-      # APT::Periodic::Unattended-Upgrade "1";
-
-      # apt install apticron
-      # /usr/lib/apticron/apticron.conf
-      # EMAIL="root@example.com"
-
       # adduser example_user
       # adduser example_user sudo
 
@@ -143,10 +113,95 @@ module SmartMachine
       # sudo apt install sendmail
       # sudo cp /etc/fail2ban/fail2ban.conf /etc/fail2ban/fail2ban.local
       # sudo cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local
-      # Change destmail, sendername, sender
+      # Change destmail
       # Change action = %(action_mwl)s
       # sudo fail2ban-client reload
       # sudo fail2ban-client status
+
+      # Send email to show that there is a need for pending updates to be completed
+      # apt install apticron
+      # /usr/lib/apticron/apticron.conf
+      # EMAIL="root@example.com"
+
+      # Automatic Updates
+      # apt install unattended-upgrades
+      # sudo systemctl enable unattended-upgrades
+      # sudo systemctl start unattended-upgrades
+      # nano /etc/apt/apt.conf.d/50unattended-upgrades
+      # Unattended-Upgrade::Mail "destemail@domain.com";
+      # Unattended-Upgrade::SyslogEnable "true";
+      # Unattended-Upgrade::Remove-Unused-Kernel-Packages "true";
+      # Unattended-Upgrade::Remove-New-Unused-Dependencies "true";
+      # Unattended-Upgrade::Remove-Unused-Dependencies "true";
+      # nano /etc/apt/apt.conf.d/20auto-upgrades
+      # APT::Periodic::Update-Package-Lists "1";
+      # APT::Periodic::Unattended-Upgrade "1";
+      # APT::Periodic::AutocleanInterval "7";
+    end
+
+    def setup_services
+      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 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)
     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
+    # 	unless system("sudo swapon -s | grep -ci '/swapfile'", out: File::NULL)
+    # 		print "-----> Creating swap swapfile ... "
+    # 		system("sudo install -o root -g root -m 0600 /dev/null /swapfile", out: File::NULL)
+    # 		system("sudo dd if=/dev/zero of=/swapfile bs=1k count=2048k", [:out, :err] => File::NULL)
+    # 		system("sudo mkswap /swapfile", out: File::NULL)
+    # 		system("sudo sh -c 'echo \"/swapfile       none    swap    sw      0       0\" >> /etc/fstab'", out: File::NULL)
+    # 		system("echo 10 | sudo tee /proc/sys/vm/swappiness", out: File::NULL)
+    # 		system("sudo sed -i '/^vm.swappiness = /d' /etc/sysctl.conf", out: File::NULL)
+    # 		system("echo vm.swappiness = 10 | sudo tee -a /etc/sysctl.conf", out: File::NULL)
+    # 		system("echo 50 | sudo tee /proc/sys/vm/vfs_cache_pressure", out: File::NULL)
+    # 		system("sudo sed -i '/^vm.vfs_cache_pressure = /d' /etc/sysctl.conf", out: File::NULL)
+    # 		system("echo vm.vfs_cache_pressure = 50 | sudo tee -a /etc/sysctl.conf", out: File::NULL)
+    # 		puts "done"
+    #
+    # 		print "-----> Starting swap swapfile ... "
+    # 		if system("sudo swapon /swapfile", out: File::NULL)
+    # 			puts "done"
+    # 		end
+    # 	end
+    # end
+    #
+    # def self.destroy_swapfile
+    # 	if system("sudo swapon -s | grep -ci '/swapfile'", out: File::NULL)
+    # 		print "-----> Stopping swap swapfile ... "
+    # 		if system("sudo swapoff /swapfile", out: File::NULL)
+    # 			system("sudo sed -i '/^vm.swappiness = /d' /etc/sysctl.conf", out: File::NULL)
+    # 		 	system("echo 100 | sudo tee /proc/sys/vm/vfs_cache_pressure", out: File::NULL)
+    # 			system("echo 60 | sudo tee /proc/sys/vm/swappiness", out: File::NULL)
+    # 			puts "done"
+    #
+    # 			print "-----> Removing swap swapfile ... "
+    # 			system("sudo sed -i '/^\\/swapfile/d' /etc/fstab", out: File::NULL)
+    # 			if system("sudo rm /swapfile", out: File::NULL)
+    # 				puts "done"
+    # 			end
+    # 		end
+    # 	end
+    # end
   end
 end

data/lib/smart_machine/syncer.rb

@@ -8,7 +8,9 @@ module SmartMachine
 
       push if initial
 
-      pull
+      # Uncomment this if you want to implement pull in sync.
+      # Ideally please remove this functionality in favour of entire server folder backup feature.
+      #pull
       push
 
       puts "-----> Syncing SmartMachine Complete"

data/lib/smart_machine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartmachine
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - plainsource
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -417,8 +417,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.2.1
-  source_code_uri: https://github.com/plainsource/smartmachine/tree/v1.2.1
+  changelog_uri: https://github.com/plainsource/smartmachine/releases/tag/v1.2.3
+  source_code_uri: https://github.com/plainsource/smartmachine/tree/v1.2.3
 post_install_message: 
 rdoc_options: []
 require_paths: