aethernal-agent 0.1.10 → 0.4.2

data/lib/aethernal_agent/plugins/tautulli/templates/tautulli.apache.conf.erb

@@ -0,0 +1,5 @@
+<Location /tautulli>
+  ProxyPass http://127.0.0.1:<%= @port %>/tautulli/
+  RequestHeader set X-Forwarded-Proto "https" env=HTTPS
+  ProxyPassReverse http://127.0.0.1:<%= @port %>/tautulli/
+</Location>

data/lib/aethernal_agent/plugins/vnc/manifest.yml

@@ -1,10 +1,11 @@
 name: Remote Desktop (VNC)
 script_name: vnc.rb
 version: 0.1
-required_aethernal_agent_version: "~> 0.1.0"
+required_aethernal_agent_version: ">= 0.2.0"
 description: Manage your server with a remote desktop instance running xfce.
 installation_type: global_install
 configuration_type: multi_user
+no_webui: true
 plain_name: vnc
 built_in_updater: false
 icon:
@@ -34,7 +35,7 @@ actions:
 estimated_size_mb: 600
 package:
   apt:
-    "18.04":
+    "1804":
       packages:
         - xfce4
         - tightvncserver

data/lib/aethernal_agent/systemd.rb

@@ -13,13 +13,17 @@ module AethernalAgent
           add_errors("Could not '#{action}' service '#{options[:service_name]}'")
         end
         results[options[:service_name]] = result
-      else
+      elsif self.manifest.services.present?
         self.manifest.services.each do |service|
-          result = run_command("sudo -iu #{self.user} systemctl --user #{action} #{service}")
-          if result == false
-            add_errors("Could not '#{action}' service '#{service}'")
+          if File.exist?(service_file_path("#{service}.service"))
+            result = run_command("sudo -iu #{self.user} systemctl --user #{action} #{service}")
+            if result == false
+              add_errors("Could not '#{action}' service '#{service}'")
+            end
+            results[service] = result
+          else
+            AethernalAgent.logger.debug("Service file service_file_path(#{service}.service did not exist, not trying to do action.")
           end
-          results[service] = result
         end
       end
 
@@ -44,7 +48,7 @@ module AethernalAgent
         write_template(
           template_path(options[:template]), #source
           service_file_path(options[:service_name]),
-          options[:vars],
+          options[:vars].reverse_merge(container_name: self.docker_container_name),
             {
               owner: options[:user]
             }
@@ -101,14 +105,16 @@ module AethernalAgent
       home_folder_path(File.join(".config/systemd/user/", service_name))
     end
 
-    SYSTEMD_ACTIONS.each do |action|
-      define_method(action) do |options = {}|
-        AethernalAgent.logger.info("#{action} on #{self.manifest.name} (#{self.manifest.services.join(' ')})")
-        opts, errors = ensure_action_options(__method__,options)
-        send("systemd_user_#{action}", opts)
-        return create_return_args(opts)
+      SYSTEMD_ACTIONS.each do |action|
+        define_method(action) do |options = {}|
+          if self.manifest.services.present?
+            AethernalAgent.logger.info("#{action} on #{self.manifest.name} (#{self.manifest.services.join(' ')})")
+            opts, errors = ensure_action_options(__method__,options)
+            send("systemd_user_#{action}", opts)
+            return create_return_args(opts)
+          end
+        end
       end
-    end
 
     # Dynamically create systemd_user_stop / start etc. actions
     def method_missing(method_name, *args)

data/lib/aethernal_agent/utils.rb

@@ -30,11 +30,66 @@ module AethernalAgent
       return string
     end
 
-    def check_port(port)
-      return false unless port
-      return false if port == nil
+    def apt_running?
+      system("lsof /var/lib/dpkg/lock > /dev/null")
+    end
+
+    def wait_on_apt(tries = 120)
+      AethernalAgent.logger.info("Waiting on APT to become ready")
+
+      while apt_running? do
+        AethernalAgent.logger.info("APT is still running, sleeping.") if tries % 10 == 0
+        tries -= 1
+        if tries <= 0
+          AethernalAgent.logger.info("Ran out of tries, exiting.")
+          return false
+        end
+        sleep 1
+      end
+
+      return true
+    end
+
+
+    def wait_on_file(path, tries = 20)
+      AethernalAgent.logger.info("Waiting on file #{path} to exist")
+
+      while !File.exist?(path) do
+        AethernalAgent.logger.info("File does not exist yet, sleeping.") if tries % 10 == 0
+        tries -= 1
+        if tries <= 0
+          AethernalAgent.logger.info("Ran out of tries, exiting.")
+          return false
+        end
+        sleep 1
+      end
+
+      return true
+    end
+
+    def wait_on_port(port, tries = 120)
+      AethernalAgent.logger.info("Waiting on port #{port} to be in use.")
+
+      while port_is_free(port) do
+        AethernalAgent.logger.info("Port not in use yet, sleeping.") if tries % 10 == 0
+        tries -= 1
+        if tries <= 0
+          AethernalAgent.logger.info("Ran out of tries, exiting.")
+          return false
+        end
+        sleep 1
+      end
+
+      # Wait a bit extra to ensure processes are fully loaded
+      sleep 2
+      return true
+    end
+
+
+    def port_is_free(port)
+      return false unless port.present?
       begin
-        server = TCPServer.new("127.0.0.1", port)
+        server = TCPServer.new("127.0.0.1", port.to_i)
         server.close
       rescue Errno::EADDRINUSE, Errno::EACCES, TypeError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH
         return false
@@ -44,7 +99,7 @@ module AethernalAgent
 
     def random_port(range = (20000..50000))
       port = range.to_a.sample
-      if port && check_port(port)
+      if port && port_is_free(port)
         return port.to_i
       else
         random_port(range)
@@ -91,7 +146,7 @@ module AethernalAgent
     end
 
     def ubuntu_release
-      return "18.04"
+      return "1804"
     end
 
     def prepare_test_config
@@ -103,5 +158,29 @@ module AethernalAgent
     def global_config_path
       "/etc/aethernal_agent.config"
     end
+
+    def docker_container_name
+      "#{self.user}.#{self.manifest.plain_name}"
+    end
+
+    def container_domain
+      "#{get_global_config(:container_name)}.#{get_global_config(:hostname)}"
+    end
+
+    def current_xdg_runtime_dir
+      "export XDG_RUNTIME_DIR=/run/user/#{get_current_uid}"
+    end
+
+    def get_current_uid
+      `id`.split("(")[0].split("=")[1]
+    end
+
+    def systemd_text_for_service(service_name)
+      run_systemd_plain("status", service_name)
+    end
+
+    def run_systemd_plain(action, service_name)
+      `#{current_xdg_runtime_dir} && systemctl --user #{action} #{service_name}`
+    end
   end
 end

data/lib/aethernal_agent/version.rb

@@ -1,3 +1,3 @@
 module AethernalAgent
-  VERSION = "0.1.10"
+  VERSION = "0.4.2"
 end

data/lib/aethernal_agent/webserver/api.rb

@@ -60,7 +60,7 @@ module AethernalAgent
             o.to_json
           else
             @@pool.add_operation(o)
-            o.uuid.to_json
+            o.uuid
           end
         end
       end

data/lib/aethernal_agent/webserver/core.rb

@@ -19,7 +19,7 @@ module AethernalAgent
           set_global_config("web_password", password)
         end
 
-        AethernalAgent.logger.info("Starting BOSS - v#{AethernalAgent::VERSION}")
+        AethernalAgent.logger.info("Starting AethernalAgent - v#{AethernalAgent::VERSION}")
 
         pool = AethernalAgent::OperationPool.new(3)
         threads = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aethernal-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.4.2
 platform: ruby
 authors:
 - Maran
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.34.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.34.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,6 +182,7 @@ description: Install and configure apps on the go.
 email:
 - maran@bytesized-hosting.com
 executables:
+- aa-cli
 - aa-web
 extensions: []
 extra_rdoc_files: []
@@ -149,6 +192,7 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
+- COPYING
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -156,20 +200,47 @@ files:
 - Vagrantfile
 - aethernal-agent.gemspec
 - bin/console
+- bin/install-aa
 - bin/run-aa-for-test
 - bin/setup
+- exe/aa-cli
 - exe/aa-web
 - lib/aethernal_agent.rb
 - lib/aethernal_agent/apache/apache.rb
+- lib/aethernal_agent/apache/templates/aa-default.conf
 - lib/aethernal_agent/apache/templates/aa-user.conf.erb
 - lib/aethernal_agent/app.rb
 - lib/aethernal_agent/apt.rb
+- lib/aethernal_agent/cli/core.rb
+- lib/aethernal_agent/cli/services.rb
+- lib/aethernal_agent/docker/container_settings.rb
+- lib/aethernal_agent/docker/env.rb
+- lib/aethernal_agent/docker/port_binding.rb
+- lib/aethernal_agent/docker/volume.rb
 - lib/aethernal_agent/errors.rb
 - lib/aethernal_agent/filesystem.rb
 - lib/aethernal_agent/loader.rb
 - lib/aethernal_agent/manifest.rb
 - lib/aethernal_agent/operation.rb
 - lib/aethernal_agent/operation_pool.rb
+- lib/aethernal_agent/plugins/bazarr/bazarr.rb
+- lib/aethernal_agent/plugins/bazarr/files/bazarr.service
+- lib/aethernal_agent/plugins/bazarr/manifest.yml
+- lib/aethernal_agent/plugins/bazarr/meta/bazarr.png
+- lib/aethernal_agent/plugins/bazarr/templates/bazarr.apache.conf.erb
+- lib/aethernal_agent/plugins/bazarr/templates/config.ini.erb
+- lib/aethernal_agent/plugins/cardigann/cardigann.rb
+- lib/aethernal_agent/plugins/cardigann/files/cardigann.service
+- lib/aethernal_agent/plugins/cardigann/manifest.yml
+- lib/aethernal_agent/plugins/cardigann/meta/cardigann.png
+- lib/aethernal_agent/plugins/cardigann/templates/cardigann.apache.conf.erb
+- lib/aethernal_agent/plugins/cardigann/templates/config.json.erb
+- lib/aethernal_agent/plugins/couchpotato/couchpotato.rb
+- lib/aethernal_agent/plugins/couchpotato/files/couchpotato.service
+- lib/aethernal_agent/plugins/couchpotato/manifest.yml
+- lib/aethernal_agent/plugins/couchpotato/meta/couchpotato.png
+- lib/aethernal_agent/plugins/couchpotato/templates/couchpotato.apache.conf.erb
+- lib/aethernal_agent/plugins/couchpotato/templates/settings.conf.erb
 - lib/aethernal_agent/plugins/deluge/deluge.rb
 - lib/aethernal_agent/plugins/deluge/manifest.yml
 - lib/aethernal_agent/plugins/deluge/meta/deluge.png
@@ -191,6 +262,33 @@ files:
 - lib/aethernal_agent/plugins/gitea/meta/gitea.png
 - lib/aethernal_agent/plugins/gitea/templates/app.ini.erb
 - lib/aethernal_agent/plugins/gitea/templates/gitea.apache.conf.erb
+- lib/aethernal_agent/plugins/jackett/files/jackett.service
+- lib/aethernal_agent/plugins/jackett/jackett.rb
+- lib/aethernal_agent/plugins/jackett/manifest.yml
+- lib/aethernal_agent/plugins/jackett/meta/jackett.png
+- lib/aethernal_agent/plugins/jackett/templates/ServerConfig.json.erb
+- lib/aethernal_agent/plugins/jackett/templates/jackett.apache.conf.erb
+- lib/aethernal_agent/plugins/jdownloader/files/jdownloader.service
+- lib/aethernal_agent/plugins/jdownloader/jdownloader.rb
+- lib/aethernal_agent/plugins/jdownloader/manifest.yml
+- lib/aethernal_agent/plugins/jdownloader/meta/jdownloader.png
+- lib/aethernal_agent/plugins/jdownloader/templates/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json.erb
+- lib/aethernal_agent/plugins/medusa/files/medusa.service
+- lib/aethernal_agent/plugins/medusa/manifest.yml
+- lib/aethernal_agent/plugins/medusa/medusa.rb
+- lib/aethernal_agent/plugins/medusa/meta/medusa.png
+- lib/aethernal_agent/plugins/medusa/templates/config.ini.erb
+- lib/aethernal_agent/plugins/medusa/templates/medusa.apache.conf.erb
+- lib/aethernal_agent/plugins/nextcloud/manifest.yml
+- lib/aethernal_agent/plugins/nextcloud/meta/nextcloud.png
+- lib/aethernal_agent/plugins/nextcloud/nextcloud.rb
+- lib/aethernal_agent/plugins/nextcloud/templates/nextcloud.apache.conf.erb
+- lib/aethernal_agent/plugins/nzbget/files/nzbget.service
+- lib/aethernal_agent/plugins/nzbget/manifest.yml
+- lib/aethernal_agent/plugins/nzbget/meta/nzbget.png
+- lib/aethernal_agent/plugins/nzbget/nzbget.rb
+- lib/aethernal_agent/plugins/nzbget/templates/nzbget.apache.conf.erb
+- lib/aethernal_agent/plugins/nzbget/templates/nzbget.conf.erb
 - lib/aethernal_agent/plugins/olaris/manifest.yml
 - lib/aethernal_agent/plugins/olaris/meta/olaris.png
 - lib/aethernal_agent/plugins/olaris/olaris.rb
@@ -201,23 +299,71 @@ files:
 - lib/aethernal_agent/plugins/ombi/ombi.rb
 - lib/aethernal_agent/plugins/ombi/templates/ombi.apache.conf.erb
 - lib/aethernal_agent/plugins/ombi/templates/ombi.service.erb
+- lib/aethernal_agent/plugins/plex-docker/manifest.yml
+- lib/aethernal_agent/plugins/plex-docker/meta/plex.png
+- lib/aethernal_agent/plugins/plex-docker/plex_docker.rb
+- lib/aethernal_agent/plugins/plex-docker/templates/Preferences.xml.erb
+- lib/aethernal_agent/plugins/plex-docker/templates/plex_docker.apache.conf.erb
+- lib/aethernal_agent/plugins/plex-docker/templates/plex_docker.service.erb
 - lib/aethernal_agent/plugins/plex/files/plex.service
 - lib/aethernal_agent/plugins/plex/manifest.yml
 - lib/aethernal_agent/plugins/plex/meta/plex.png
 - lib/aethernal_agent/plugins/plex/plex.rb
 - lib/aethernal_agent/plugins/plex/templates/Preferences.xml.erb
+- lib/aethernal_agent/plugins/plex/templates/plex.apache.conf.erb
+- lib/aethernal_agent/plugins/portainer/manifest.yml
+- lib/aethernal_agent/plugins/portainer/meta/portainer.png
+- lib/aethernal_agent/plugins/portainer/portainer.rb
+- lib/aethernal_agent/plugins/portainer/templates/portainer.apache.conf.erb
+- lib/aethernal_agent/plugins/portainer/templates/portainer.service.erb
 - lib/aethernal_agent/plugins/radarr/files/radarr.service
 - lib/aethernal_agent/plugins/radarr/manifest.yml
 - lib/aethernal_agent/plugins/radarr/meta/radarr.png
 - lib/aethernal_agent/plugins/radarr/radarr.rb
 - lib/aethernal_agent/plugins/radarr/templates/config.xml.erb
 - lib/aethernal_agent/plugins/radarr/templates/radarr.apache.conf.erb
+- lib/aethernal_agent/plugins/resilio_docker/manifest.yml
+- lib/aethernal_agent/plugins/resilio_docker/meta/resilio.png
+- lib/aethernal_agent/plugins/resilio_docker/resilio_docker.rb
+- lib/aethernal_agent/plugins/resilio_docker/templates/resilio_docker.apache.conf.erb
+- lib/aethernal_agent/plugins/resilio_docker/templates/resilio_docker.conf.erb
+- lib/aethernal_agent/plugins/resilio_docker/templates/resilio_docker.service.erb
+- lib/aethernal_agent/plugins/rutorrent/manifest.yml
+- lib/aethernal_agent/plugins/rutorrent/meta/rtorrent.png
+- lib/aethernal_agent/plugins/rutorrent/rutorrent.rb
+- lib/aethernal_agent/plugins/rutorrent/templates/rtorrent.rc.erb
+- lib/aethernal_agent/plugins/rutorrent/templates/rutorrent.apache.conf.erb
+- lib/aethernal_agent/plugins/rutorrent/templates/rutorrent.service.erb
+- lib/aethernal_agent/plugins/sabnzbd/files/sabnzbd.service
+- lib/aethernal_agent/plugins/sabnzbd/manifest.yml
+- lib/aethernal_agent/plugins/sabnzbd/meta/sabnzbd.png
+- lib/aethernal_agent/plugins/sabnzbd/sabnzbd.rb
+- lib/aethernal_agent/plugins/sabnzbd/templates/sabnzbd.apache.conf.erb
+- lib/aethernal_agent/plugins/sabnzbd/templates/sabnzbd.ini.erb
+- lib/aethernal_agent/plugins/sickchill/files/sickchill.service
+- lib/aethernal_agent/plugins/sickchill/manifest.yml
+- lib/aethernal_agent/plugins/sickchill/meta/sickchill.png
+- lib/aethernal_agent/plugins/sickchill/sickchill.rb
+- lib/aethernal_agent/plugins/sickchill/templates/config.ini.erb
+- lib/aethernal_agent/plugins/sickchill/templates/sickchill.apache.conf.erb
 - lib/aethernal_agent/plugins/sonarr/files/sonarr.service
 - lib/aethernal_agent/plugins/sonarr/manifest.yml
 - lib/aethernal_agent/plugins/sonarr/meta/sonarr.jpeg
 - lib/aethernal_agent/plugins/sonarr/sonarr.rb
 - lib/aethernal_agent/plugins/sonarr/templates/config.xml.erb
 - lib/aethernal_agent/plugins/sonarr/templates/sonarr.apache.conf.erb
+- lib/aethernal_agent/plugins/syncthing/files/syncthing.service
+- lib/aethernal_agent/plugins/syncthing/manifest.yml
+- lib/aethernal_agent/plugins/syncthing/meta/syncthing.png
+- lib/aethernal_agent/plugins/syncthing/syncthing.rb
+- lib/aethernal_agent/plugins/syncthing/templates/config.xml.erb
+- lib/aethernal_agent/plugins/syncthing/templates/syncthing.apache.conf.erb
+- lib/aethernal_agent/plugins/tautulli/files/tautulli.service
+- lib/aethernal_agent/plugins/tautulli/manifest.yml
+- lib/aethernal_agent/plugins/tautulli/meta/tautulli.png
+- lib/aethernal_agent/plugins/tautulli/tautulli.rb
+- lib/aethernal_agent/plugins/tautulli/templates/config.ini.erb
+- lib/aethernal_agent/plugins/tautulli/templates/tautulli.apache.conf.erb
 - lib/aethernal_agent/plugins/vnc/files/xstartup
 - lib/aethernal_agent/plugins/vnc/manifest.yml
 - lib/aethernal_agent/plugins/vnc/meta/vnc.png
@@ -235,7 +381,7 @@ metadata:
   homepage_uri: https://aethernal.host
   source_code_uri: http://gitlab.com/olaris/aethernal_agent
   changelog_uri: http://gitlab.com/olaris/aethernal_agent
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -251,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Aethernal Agent for Aethernal.host.
 test_files: []