aethernal-agent 0.4.1 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74baa32065150a5dfe178e860adc4aa26272866ec936e467d004e5c2e23b7803
-  data.tar.gz: 35b520d49d1345cb500b1bb283e0f5626fd2a07e773bafe19d17e2ec731cc673
+  metadata.gz: 4673506df3f78a5ee742b04f05780d3602598a7ae09a2b1c574ef2b003520520
+  data.tar.gz: 2d5f819ceda2b100166877be6b227b756e994b4e54172d4d453de96b650d87ff
 SHA512:
-  metadata.gz: aefbdbcebc94476405140552f4930a18b68beb2465eede62ff90959fe896fd33d7ae80dc5892b596811c24dc682a6988f3f19c3e6d61e700f9d85157187d1a5f
-  data.tar.gz: e8aec83e85f96aca92c340c1d1578f911af9e7bc47b4e8643233127ef6e068206bad3599479ce7d747445ddf689fb61403a839ea2382392535c7f61ab1d8554d
+  metadata.gz: b619e7e3069d8ca2237e354dc29827b1ddbb455099df7a301eb16ebf47e46186d5ef008ef4871941ac8688ff9ea08d9c3bc459af7b06871aa01260fe15dd75e5
+  data.tar.gz: 88f96600bbe41f2471d69dc302d8fbc89fb3c23ce02cac249318addab627bdbab6ae6cdcbefbe5994a230230b271e23d7b2579f1c5584e61bef1c70b23c2d281

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    aethernal-agent (0.4.1)
-      activesupport
+    aethernal-agent (0.4.3)
+      activesupport (~> 6.0.3.4)
       bcrypt
       docker-api (~> 1.34.2)
+      ruby2_keywords (= 0.0.2)
       sinatra (~> 2.0.7)
       sinatra-contrib
       sqlite3
@@ -20,7 +21,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    backports (3.18.2)
+    backports (3.20.1)
     bcrypt (3.1.16)
     coderay (1.1.3)
     concurrent-ruby (1.1.7)
@@ -28,11 +29,11 @@ GEM
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    excon (0.78.0)
-    i18n (1.8.5)
+    excon (0.78.1)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -93,7 +94,7 @@ GEM
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
     zeitwerk (2.4.2)
@@ -109,4 +110,4 @@ DEPENDENCIES
   serverspec
 
 BUNDLED WITH
-   2.1.4
+   2.2.5

data/aethernal-agent.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "serverspec"
   spec.add_development_dependency "pry"
   spec.add_dependency "activesupport" # We leave this loose to not interfere with Rails projects
+  spec.add_dependency "ruby2_keywords", "0.0.2" # We leave this loose to not interfere with Rails projects
   spec.add_dependency "sinatra", "~> 2.0.7"
   spec.add_dependency "sinatra-contrib"
   spec.add_dependency "sqlite3"

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 docker-ce=5:19.03.13~3-0~ubuntu-bionic
   fi
 
   if [[ "$1" = "from-ci" ]];then

data/lib/aethernal_agent/app.rb

@@ -373,5 +373,6 @@ module AethernalAgent
 
       return sha.hexdigest
     end
+
   end
 end

data/lib/aethernal_agent/docker/container_settings.rb

@@ -19,7 +19,7 @@ module AethernalAgent
           'Env' => self.env,
           'HostConfig' =>
           {
-            'RestartPolicy' => {'Name' => 'on-failure'},
+            'RestartPolicy' => {'Name' => 'unless-stopped'},
             'PortBindings' => self.port_bindings,
             'Binds' => self.volumes,
             'Volumes' => {"/data" => {},"/config" => {}},

data/lib/aethernal_agent/plugins/deluge/deluge.rb

@@ -55,6 +55,11 @@ class AethernalAgent::Deluge < AethernalAgent::App
                      deluge_config_path('hostlist.conf'),
                      vars,
                      {owner: vars[:user]})
+
+      write_template(template_path('ltconfig.conf.erb'),
+                     deluge_config_path('ltconfig.conf'),
+                     vars,
+                     {owner: vars[:user]})
     end
   end
 

data/lib/aethernal_agent/plugins/deluge/templates/core.conf.erb

@@ -15,7 +15,7 @@
     "dont_count_slow_torrents": false,
     "download_location": "<%= @home %>/Downloads",
     "download_location_paths_list": [],
-    "enabled_plugins": [],
+    "enabled_plugins": ["ltConfig"],
     "enc_in_policy": 1,
     "enc_level": 2,
     "enc_out_policy": 1,

data/lib/aethernal_agent/plugins/deluge/templates/ltconfig.conf.erb

@@ -0,0 +1,21 @@
+{
+  "file": 1,
+    "format": 1
+}{
+  "apply_on_start": true,
+    "settings": {
+      "allow_multiple_connections_per_ip": true,
+      "suggest_mode": 0,
+      "mixed_mode_algorithm": 0,
+      "low_prio_disk": false,
+      "alert_queue_size": 30000,
+      "max_queued_disk_bytes": 5242880,
+      "utp_dynamic_sock_buf": true,
+      "max_allowed_in_request_queue": 1000,
+      "file_pool_size": 100,
+      "inactivity_timeout": 20,
+      "max_failcount": 1,
+      "send_redundant_have": true,
+      "peer_timeout": 20
+    }
+}

data/lib/aethernal_agent/plugins/jdownloader/files/jdownloader.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Jdownloader
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/java -XX:MaxHeapSize=512m -XX:InitialHeapSize=512m -jar %h/apps/jdownloader/JDownloader.jar -headless -afterupdate
+TimeoutStopSec=20
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=default.target

data/lib/aethernal_agent/plugins/jdownloader/jdownloader.rb

@@ -0,0 +1,38 @@
+class AethernalAgent::Jdownloader < AethernalAgent::App
+  def initialize(options = {})
+    super(options)
+  end
+
+  def install_packages(options = {})
+    remove_app_user
+    super(options)
+    run_as('root',"mv #{app_path}/jdownloader/* #{app_path}/")
+    directory(app_path, owner: @user)
+    directory(jdownloader_config_path, owner: @user)
+  end
+
+  def remove_app_user(options = {})
+    super(options) do |opts|
+      directory(app_path, action: :delete)
+      directory(jdownloader_config_path, action: :delete)
+    end
+  end
+
+  def configure_app_user(options = {})
+    self.install_packages(options)
+
+    super(options) do |opts|
+      write_template(template_path('org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json.erb'),
+                     "#{app_path}/cfg/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json",
+                     opts.merge(server_name: get_global_config(:container_name)),
+                     {owner: self.user})
+    end
+  end
+
+  protected
+
+  def jdownloader_config_path(path ="/")
+    File.join(home_folder_path(".config/jdownloader"), path)
+  end
+
+end

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

@@ -0,0 +1,53 @@
+name: Jdownloader
+script_name: jdownloader.rb
+version: 0.1
+required_aethernal_agent_version: ">= 0.2.0"
+description: JDownloader is a free, open-source download management tool. In order for your Jdownloader to be installed you first have to create an account on my.jdownloader.org with email and password and then use those credentials for the installation of Jdownloader.
+installation_type: local_install
+configuration_type: multi_user
+icon:
+  name: jdownloader.png
+  sha256sum: 5e8be893fb1cca59fb07ba84d9991063434156d4600bae6261350ea3c12329da
+plain_name: jdownloader
+web_ui_url: http://my.jdownloader.org/
+services:
+  - jdownloader
+actions:
+  restart:
+    user:
+      required: true
+      linux_user: true
+  uninstall:
+    nothing: true
+  install_packages:
+    user:
+      required: true
+      linux_user: true
+  remove_app_user:
+    user:
+      required: true
+      linux_user: true
+  configure_app_user:
+    email:
+      required: true
+    password:
+      required: true
+    return_values:
+      - email
+      - password
+    display_values:
+      - email
+      - password
+estimated_size_mb: 43
+package:
+  folder_name: jdownloader
+  direct_download:
+    url: https://storage.googleapis.com/bysh-chef-files/jdownloader.zip
+    target_name: jdownloader.zip
+    auto_extract: true
+    always_latest: true
+  apt:
+    "1804":
+      packages:
+        - default-jre
+        - default-jdk

data/lib/aethernal_agent/plugins/jdownloader/templates/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json.erb

@@ -0,0 +1,5 @@
+{
+  "email" : "<%= @email %>",
+  "password" : "<%= @password %>",
+  "devicename" : "<%= @user %>@<%= @server_name %>"
+}

data/lib/aethernal_agent/version.rb

@@ -1,3 +1,3 @@
 module AethernalAgent
-  VERSION = "0.4.1"
+  VERSION = "0.4.6"
 end

data/lib/aethernal_agent/webserver/api.rb

@@ -49,6 +49,12 @@ module AethernalAgent
           end
         end
 
+        post "/refresh_apache_configuration" do
+          options = {custom_domains: params['custom_domains'], user: params['user']}
+          apache = AethernalAgent::Apache.new(options)
+          apache.ensure_base_config(options)
+        end
+
         post "/plugins/:app_name/:method_name/?:wait?" do
           app = params['app_name']
           method = params['method_name']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aethernal-agent
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.6
 platform: ruby
 authors:
 - Maran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +264,7 @@ files:
 - lib/aethernal_agent/plugins/deluge/templates/deluge.apache.conf.erb
 - lib/aethernal_agent/plugins/deluge/templates/deluged.service.erb
 - lib/aethernal_agent/plugins/deluge/templates/hostlist.conf.erb
+- lib/aethernal_agent/plugins/deluge/templates/ltconfig.conf.erb
 - lib/aethernal_agent/plugins/deluge/templates/web.conf.erb
 - lib/aethernal_agent/plugins/filebrowser/filebrowser.rb
 - lib/aethernal_agent/plugins/filebrowser/files/filebrowser.service
@@ -268,6 +283,11 @@ files:
 - 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
@@ -391,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.5
 signing_key:
 specification_version: 4
 summary: Aethernal Agent for Aethernal.host.