aethernal-agent 0.4.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c94842a214bb90fda3cb3f4f3f873fd07c54be50419b2617c04a4b4f781bbbd0
-  data.tar.gz: fc87c8f9dd9bbc6c00d994243994c34a71cc46df22b4d5873b85f4953b7e92a9
+  metadata.gz: 368455ca592a94cd9d4f03cdf18258ed027aa565fc7ab54ebaa46e68e5038277
+  data.tar.gz: a6e4a94fc5c90aae47e890ffe7b045a478713132d865fdc9878df8648c8ed343
 SHA512:
-  metadata.gz: 54471d28ac3221eb126975d04869e981956b68a57ece41f73c1a983c0ffc3c8d24e71756c3539d414c847ae2f4a03f91ea0988dcb425104158859fc2930d38b9
-  data.tar.gz: c88c8faad630609eab8b961aa6b12feaed4a68d1a21c6722361ecd249f38b3970dcd3269926bc9c4885e92ec1a2ae449192572fd2d8dbb032e5c86ed19734bd2
+  metadata.gz: ef03cc63d4b10dc016ab92ab8f991e3eddceec33924d0b8a2798f3ad854f2a560acfe07da52a711a6ccc6a4b0e0b8ecc3594d11d30a9ea21586b001399b5ce65
+  data.tar.gz: 2fbdcaa462d013428e95723b505de9cfb3a4dba645d58dc2efa6bcca067c2af873368a8935f338eaee66faa933163cd882fdf7433aa4b24293986217dd5d8b2d

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    aethernal-agent (0.4.3)
-      activesupport (~> 6.0.3.4)
+    aethernal-agent (0.5.0)
+      activesupport
       bcrypt
       docker-api (~> 1.34.2)
       ruby2_keywords (= 0.0.2)
@@ -15,25 +15,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    backports (3.20.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    backports (3.21.0)
     bcrypt (3.1.16)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    excon (0.78.1)
-    i18n (1.8.7)
+    excon (0.81.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -89,14 +89,13 @@ GEM
       net-telnet (= 0.1.1)
       sfl
     sqlite3 (1.4.2)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    terminal-table (3.0.1)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.1.0)
     tilt (2.0.10)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -110,4 +109,4 @@ DEPENDENCIES
   serverspec
 
 BUNDLED WITH
-   2.2.5
+   2.2.15

data/bin/install-aa

@@ -105,7 +105,8 @@ main() {
     echo "Docker not installed, doing that now"
     run curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
     add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-    run apt-get install -y docker-ce
+    # This will break when we support multiple Ubuntu versions
+    run apt-get install -y --allow-downgrades docker-ce=5:19.03.13~3-0~ubuntu-bionic containerd.io=1.3.9-1 docker-ce-cli=5:19.03.13~3-0~ubuntu-bionic
   fi
 
   if [[ "$1" = "from-ci" ]];then

data/lib/aethernal_agent/app.rb

@@ -21,6 +21,8 @@ module AethernalAgent
 
     def initialize(options = {})
       options = HashWithIndifferentAccess.new(options)
+      options[:ubuntu_version] = ubuntu_release
+
       self.global_options = options
       self.plugin_path = options[:file_path] || caller_locations(0)[1].path
       self.user = options[:user]
@@ -44,8 +46,11 @@ module AethernalAgent
       self.manifest.package.each_key do |package_type|
         case package_type
         when 'apt'
+          AethernalAgent.logger.debug("apt options: #{self.manifest.package['apt']} for ubuntu version #{ubuntu_release}")
           options = self.manifest.package['apt'][ubuntu_release]
-          AethernalAgent.logger.debug("Using apt for ubuntu #{ubuntu_release} - #{options}")
+          options = self.manifest.package['apt']["all"] if self.manifest.package['apt']["all"].present?
+
+          AethernalAgent.logger.debug("Matched options:  #{options}")
           packages = options['packages']
 
           if options.has_key?('add_sources')
@@ -71,9 +76,12 @@ module AethernalAgent
           end
         when 'direct_download'
           opts = self.manifest.package[package_type]
+          opts = self.manifest.package[package_type][ubuntu_release] if self.manifest.package[package_type][ubuntu_release].present?
+
           target_file = File.join(app_path, opts["target_name"])
           directory(app_path, owner: self.user)
           AethernalAgent.logger.debug("Downloading file from '#{opts["url"]}' to '#{target_file}'")
+
           File.open(target_file, "wb") do |saved_file|
             open(opts["url"], "rb") do |read_file|
               saved_file.write(read_file.read)

data/lib/aethernal_agent/apt.rb

@@ -17,6 +17,7 @@ module AethernalAgent
     end
 
     def apt_package(options = {})
+      AethernalAgent.logger.info "Installing apt package(s) with options: #{options}"
       action = options[:action]
       action = :install if action.nil?
 

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

@@ -62,3 +62,8 @@ package:
         - python3.7
         - python3-distutils
         - python3-pip
+    "2004":
+      packages:
+        - python3.8
+        - python3-distutils
+        - python3-pip

data/lib/aethernal_agent/plugins/bazarr/{files/bazarr.service → templates/bazarr.service.erb}

@@ -7,7 +7,11 @@ UMask=0002
 Restart=on-failure
 RestartSec=5
 Type=simple
+<% if @ubuntu_version == "2004" %>
+ExecStart=/usr/bin/python3.8 %h/apps/bazarr/bazarr.py -c %h/.config/bazarr/data
+<% else %>
 ExecStart=/usr/bin/python3.7 %h/apps/bazarr/bazarr.py -c %h/.config/bazarr/data
+<% end %>
 KillSignal=SIGINT
 TimeoutStopSec=20
 SyslogIdentifier=bazarr

data/lib/aethernal_agent/plugins/gitea/gitea.rb

@@ -6,6 +6,7 @@ class AethernalAgent::Gitea < AethernalAgent::App
   def install_packages(options = {})
     super(options)
     file(gitea_path, chmod: 711, owner: self.user)
+    file(File.join(gitea_path, 'gitea'), chmod: 711, owner: self.user)
   end
 
   def remove_app_user(options = {})

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

@@ -48,7 +48,7 @@ estimated_size_mb: 18
 package:
   folder_name: jackett
   direct_download:
-    url: https://github.com/Jackett/Jackett/releases/download/v0.16.1902/Jackett.Binaries.LinuxAMDx64.tar.gz
+    url: https://github.com/Jackett/Jackett/releases/download/v0.17.933/Jackett.Binaries.LinuxAMDx64.tar.gz
     target_name: Jackett.Binaries.LinuxAMDx64.tar.gz
     auto_extract: true
     always_latest: false

data/lib/aethernal_agent/plugins/jackett/templates/ServerConfig.json.erb

@@ -3,6 +3,7 @@
   "AllowExternal": true,
   "APIKey": "<%= @api_key %>",
   "AdminPassword": "<%= @sha_password %>",
-  "UpdateDisabled": false,
+  "UpdateDisabled": true,
+  "BasePathOverride": "/jackett",
   "UpdatePrerelease": false
 }

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

@@ -41,10 +41,16 @@ estimated_size_mb: 295
 package:
   folder_name: nextcloud
   direct_download:
-    url: https://download.nextcloud.com/server/releases/nextcloud-18.0.4.tar.bz2
-    target_name: nextcloud-18.0.4.tar.bz2
-    auto_extract: true
-    always_latest: false
+    "1804":
+      url: https://download.nextcloud.com/server/releases/nextcloud-18.0.4.tar.bz2
+      target_name: nextcloud-18.0.4.tar.bz2
+      auto_extract: true
+      always_latest: false
+    "2004":
+      url: https://download.nextcloud.com/server/releases/nextcloud-21.0.2.tar.bz2
+      target_name: nextcloud-21.0.2.tar.bz2
+      auto_extract: true
+      always_latest: false
   apt:
     "1804":
       packages:
@@ -52,3 +58,9 @@ package:
         - php-sqlite3
         - php7.2-gd php7.2-json php7.2-mysql php7.2-curl php7.2-mbstring
         - php7.2-intl php-imagick php7.2-xml php7.2-zip
+    "2004":
+      packages:
+        - libapache2-mod-php7.4
+        - php-sqlite3
+        - php7.4-gd php7.4-json php7.4-mysql php7.4-curl php7.4-mbstring
+        - php7.4-intl php-imagick php7.4-xml php7.4-zip

data/lib/aethernal_agent/plugins/nextcloud/nextcloud.rb

@@ -1,10 +1,10 @@
 class AethernalAgent::Nextcloud < AethernalAgent::App
   def initialize(options = {})
-    options[:home] = home_folder_path
     super(options)
   end
 
   def install_packages(options = {})
+    options[:home] = home_folder_path
     remove_app_user
     super(options)
     directory(home_folder_path("/www"), action: :create)

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

@@ -53,7 +53,7 @@ package:
     auto_extract: true
     always_latest: false
   apt:
-    "1804":
+    "all":
       packages:
         - libicu-dev
         - libunwind8

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

@@ -48,3 +48,10 @@ package:
           key_url: "https://downloads.plex.tv/plex-keys/PlexSign.key"
       packages:
         - plexmediaserver
+    "2004":
+      add_sources:
+        plex:
+          source_url: "deb https://downloads.plex.tv/repo/deb public main"
+          key_url: "https://downloads.plex.tv/plex-keys/PlexSign.key"
+      packages:
+        - plexmediaserver

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

@@ -52,7 +52,7 @@ estimated_size_mb: 23
 package:
   folder_name: Radarr
   apt:
-    "1804":
+    "all":
       packages:
         - mediainfo
   direct_download:

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

@@ -81,4 +81,4 @@ actions:
 estimated_size_mb: 80
 package:
   docker:
-    image: "crazymax/rtorrent-rutorrent"
+    image: "crazymax/rtorrent-rutorrent:3.9-0.9.8-0.13.8"

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

@@ -35,7 +35,7 @@ package:
     auto_extract: true
     always_latest: false
   apt:
-    "1804":
+    "all":
       packages:
         - python3
         - python3-pip

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

@@ -65,3 +65,11 @@ package:
       packages:
         - mono-devel
         - mediainfo
+    "2004":
+      add_sources:
+        mono_stable:
+          source_url: "deb https://download.mono-project.com/repo/ubuntu stable-focal main"
+          key_id: "3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
+      packages:
+        - mono-devel
+        - mediainfo

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

@@ -38,3 +38,9 @@ package:
         - python-pip
         - python-setuptools
         - python-pkg-resources
+    "2004":
+      packages:
+        - python3
+        - python3-pip
+        - python3-setuptools
+        - python3-pkg-resources

data/lib/aethernal_agent/plugins/tautulli/tautulli.rb

@@ -26,13 +26,13 @@ class AethernalAgent::Tautulli < AethernalAgent::App
         tautulli_config_path: tautulli_config_path,
         password: opts['password'],
         user: self.user}
-
-      write_template(template_path('config.ini.erb'),
-                   tautulli_config_path('config.ini'),
-                   @vars,
-                   {owner: self.user})
     end
 
+    write_template(template_path('config.ini.erb'),
+             tautulli_config_path('config.ini'),
+             @vars,
+             {owner: self.user})
+
     return create_return_args(@vars)
   end
 

data/lib/aethernal_agent/plugins/tautulli/templates/config.ini.erb

@@ -182,19 +182,19 @@ home_stats_count = 5
 cleanup_files = 0
 check_github_on_startup = 1
 http_port = <%= @port %>
-log_dir = <%= @tautulli_config_path %>/logs
+log_dir = <%= @tautulli_config_path %>/data/logs
 update_db_interval = 24
 interface = default
 pms_ssl = 0
 git_path = ""
 home_stats_cards = "watch_statistics, top_tv, popular_tv, top_movies, popular_movies, top_music, popular_music, top_users, top_platforms, last_watched"
 time_format = HH:mm
-cache_dir = <%= @tautulli_config_path %>/cache
-https_cert = <%= @tautulli_config_path %>/server.crt
+cache_dir = <%= @tautulli_config_path %>/data/cache
+https_cert = <%= @tautulli_config_path %>/data/server.crt
 api_key = ""
 date_format = YYYY-MM-DD
 home_stats_type = 0
-https_key = <%= @tautulli_config_path %>/server.key
+https_key = <%= @tautulli_config_path %>/data/server.key
 git_user = drzoidberg33
 home_library_cards = library_statistics_first
 git_branch = master

data/lib/aethernal_agent/plugins/tautulli/{files/tautulli.service → templates/tautulli.service.erb}

@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=simple
-ExecStart=%h/apps/tautulli/Tautulli.py --config=%h/.config/tautulli/config.ini --datadir=%h/.config/tautulli
+ExecStart=/usr/bin/python3 %h/apps/tautulli/Tautulli.py --config=%h/.config/tautulli/config.ini --datadir=%h/.config/tautulli/data
 TimeoutStopSec=20
 KillMode=process
 Restart=on-failure

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

@@ -35,7 +35,7 @@ actions:
 estimated_size_mb: 600
 package:
   apt:
-    "1804":
+    "all":
       packages:
         - xfce4
         - tightvncserver

data/lib/aethernal_agent/utils.rb

@@ -50,7 +50,6 @@ module AethernalAgent
       return true
     end
 
-
     def wait_on_file(path, tries = 20)
       AethernalAgent.logger.info("Waiting on file #{path} to exist")
 
@@ -146,7 +145,10 @@ module AethernalAgent
     end
 
     def ubuntu_release
-      return "1804"
+      AethernalAgent.logger.debug("Looking for Linux version number.")
+      version_number = %x( lsb_release -sr )
+      AethernalAgent.logger.debug("Returning version number: #{version_number.to_s.gsub('.', '')}")
+      version_number.to_s.gsub('.', '').strip
     end
 
     def prepare_test_config

data/lib/aethernal_agent/version.rb

@@ -1,3 +1,3 @@
 module AethernalAgent
-  VERSION = "0.4.5"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aethernal-agent
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.1
 platform: ruby
 authors:
 - Maran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -238,10 +238,10 @@ files:
 - 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/bazarr.service.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
@@ -373,12 +373,12 @@ files:
 - 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/tautulli/templates/tautulli.service.erb
 - lib/aethernal_agent/plugins/vnc/files/xstartup
 - lib/aethernal_agent/plugins/vnc/manifest.yml
 - lib/aethernal_agent/plugins/vnc/meta/vnc.png
@@ -411,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.2.18
 signing_key:
 specification_version: 4
 summary: Aethernal Agent for Aethernal.host.