aethernal-agent 0.4.5 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +19 -20
- data/bin/install-aa +2 -1
- data/lib/aethernal_agent/app.rb +9 -1
- data/lib/aethernal_agent/apt.rb +1 -0
- data/lib/aethernal_agent/plugins/bazarr/manifest.yml +5 -0
- data/lib/aethernal_agent/plugins/bazarr/{files/bazarr.service → templates/bazarr.service.erb} +4 -0
- data/lib/aethernal_agent/plugins/gitea/gitea.rb +1 -0
- data/lib/aethernal_agent/plugins/jackett/manifest.yml +1 -1
- data/lib/aethernal_agent/plugins/jackett/templates/ServerConfig.json.erb +2 -1
- data/lib/aethernal_agent/plugins/nextcloud/manifest.yml +16 -4
- data/lib/aethernal_agent/plugins/nextcloud/nextcloud.rb +1 -1
- data/lib/aethernal_agent/plugins/ombi/manifest.yml +1 -1
- data/lib/aethernal_agent/plugins/plex/manifest.yml +7 -0
- data/lib/aethernal_agent/plugins/radarr/manifest.yml +1 -1
- data/lib/aethernal_agent/plugins/rutorrent/manifest.yml +1 -1
- data/lib/aethernal_agent/plugins/sabnzbd/manifest.yml +1 -1
- data/lib/aethernal_agent/plugins/sonarr/manifest.yml +8 -0
- data/lib/aethernal_agent/plugins/tautulli/manifest.yml +6 -0
- data/lib/aethernal_agent/plugins/tautulli/tautulli.rb +5 -5
- data/lib/aethernal_agent/plugins/tautulli/templates/config.ini.erb +4 -4
- data/lib/aethernal_agent/plugins/tautulli/{files/tautulli.service → templates/tautulli.service.erb} +1 -1
- data/lib/aethernal_agent/plugins/vnc/manifest.yml +1 -1
- data/lib/aethernal_agent/utils.rb +4 -2
- data/lib/aethernal_agent/version.rb +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 368455ca592a94cd9d4f03cdf18258ed027aa565fc7ab54ebaa46e68e5038277
|
4
|
+
data.tar.gz: a6e4a94fc5c90aae47e890ffe7b045a478713132d865fdc9878df8648c8ed343
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ef03cc63d4b10dc016ab92ab8f991e3eddceec33924d0b8a2798f3ad854f2a560acfe07da52a711a6ccc6a4b0e0b8ecc3594d11d30a9ea21586b001399b5ce65
|
7
|
+
data.tar.gz: 2fbdcaa462d013428e95723b505de9cfb3a4dba645d58dc2efa6bcca067c2af873368a8935f338eaee66faa933163cd882fdf7433aa4b24293986217dd5d8b2d
|
data/Gemfile.lock
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
aethernal-agent (0.
|
5
|
-
activesupport
|
4
|
+
aethernal-agent (0.5.0)
|
5
|
+
activesupport
|
6
6
|
bcrypt
|
7
7
|
docker-api (~> 1.34.2)
|
8
8
|
ruby2_keywords (= 0.0.2)
|
@@ -15,25 +15,25 @@ PATH
|
|
15
15
|
GEM
|
16
16
|
remote: https://rubygems.org/
|
17
17
|
specs:
|
18
|
-
activesupport (6.
|
18
|
+
activesupport (6.1.3.2)
|
19
19
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
20
|
-
i18n (>=
|
21
|
-
minitest (
|
22
|
-
tzinfo (~>
|
23
|
-
zeitwerk (~> 2.
|
24
|
-
backports (3.
|
20
|
+
i18n (>= 1.6, < 2)
|
21
|
+
minitest (>= 5.1)
|
22
|
+
tzinfo (~> 2.0)
|
23
|
+
zeitwerk (~> 2.3)
|
24
|
+
backports (3.21.0)
|
25
25
|
bcrypt (3.1.16)
|
26
26
|
coderay (1.1.3)
|
27
|
-
concurrent-ruby (1.1.
|
27
|
+
concurrent-ruby (1.1.8)
|
28
28
|
diff-lcs (1.4.4)
|
29
29
|
docker-api (1.34.2)
|
30
30
|
excon (>= 0.47.0)
|
31
31
|
multi_json
|
32
|
-
excon (0.
|
33
|
-
i18n (1.8.
|
32
|
+
excon (0.81.0)
|
33
|
+
i18n (1.8.10)
|
34
34
|
concurrent-ruby (~> 1.0)
|
35
35
|
method_source (1.0.0)
|
36
|
-
minitest (5.14.
|
36
|
+
minitest (5.14.4)
|
37
37
|
multi_json (1.15.0)
|
38
38
|
mustermann (1.1.1)
|
39
39
|
ruby2_keywords (~> 0.0.1)
|
@@ -89,14 +89,13 @@ GEM
|
|
89
89
|
net-telnet (= 0.1.1)
|
90
90
|
sfl
|
91
91
|
sqlite3 (1.4.2)
|
92
|
-
terminal-table (
|
93
|
-
unicode-display_width (
|
94
|
-
thor (1.0
|
95
|
-
thread_safe (0.3.6)
|
92
|
+
terminal-table (3.0.1)
|
93
|
+
unicode-display_width (>= 1.1.1, < 3)
|
94
|
+
thor (1.1.0)
|
96
95
|
tilt (2.0.10)
|
97
|
-
tzinfo (
|
98
|
-
|
99
|
-
unicode-display_width (
|
96
|
+
tzinfo (2.0.4)
|
97
|
+
concurrent-ruby (~> 1.0)
|
98
|
+
unicode-display_width (2.0.0)
|
100
99
|
zeitwerk (2.4.2)
|
101
100
|
|
102
101
|
PLATFORMS
|
@@ -110,4 +109,4 @@ DEPENDENCIES
|
|
110
109
|
serverspec
|
111
110
|
|
112
111
|
BUNDLED WITH
|
113
|
-
2.2.
|
112
|
+
2.2.15
|
data/bin/install-aa
CHANGED
@@ -105,7 +105,8 @@ main() {
|
|
105
105
|
echo "Docker not installed, doing that now"
|
106
106
|
run curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
|
107
107
|
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
|
108
|
-
|
108
|
+
# This will break when we support multiple Ubuntu versions
|
109
|
+
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
|
109
110
|
fi
|
110
111
|
|
111
112
|
if [[ "$1" = "from-ci" ]];then
|
data/lib/aethernal_agent/app.rb
CHANGED
@@ -21,6 +21,8 @@ module AethernalAgent
|
|
21
21
|
|
22
22
|
def initialize(options = {})
|
23
23
|
options = HashWithIndifferentAccess.new(options)
|
24
|
+
options[:ubuntu_version] = ubuntu_release
|
25
|
+
|
24
26
|
self.global_options = options
|
25
27
|
self.plugin_path = options[:file_path] || caller_locations(0)[1].path
|
26
28
|
self.user = options[:user]
|
@@ -44,8 +46,11 @@ module AethernalAgent
|
|
44
46
|
self.manifest.package.each_key do |package_type|
|
45
47
|
case package_type
|
46
48
|
when 'apt'
|
49
|
+
AethernalAgent.logger.debug("apt options: #{self.manifest.package['apt']} for ubuntu version #{ubuntu_release}")
|
47
50
|
options = self.manifest.package['apt'][ubuntu_release]
|
48
|
-
|
51
|
+
options = self.manifest.package['apt']["all"] if self.manifest.package['apt']["all"].present?
|
52
|
+
|
53
|
+
AethernalAgent.logger.debug("Matched options: #{options}")
|
49
54
|
packages = options['packages']
|
50
55
|
|
51
56
|
if options.has_key?('add_sources')
|
@@ -71,9 +76,12 @@ module AethernalAgent
|
|
71
76
|
end
|
72
77
|
when 'direct_download'
|
73
78
|
opts = self.manifest.package[package_type]
|
79
|
+
opts = self.manifest.package[package_type][ubuntu_release] if self.manifest.package[package_type][ubuntu_release].present?
|
80
|
+
|
74
81
|
target_file = File.join(app_path, opts["target_name"])
|
75
82
|
directory(app_path, owner: self.user)
|
76
83
|
AethernalAgent.logger.debug("Downloading file from '#{opts["url"]}' to '#{target_file}'")
|
84
|
+
|
77
85
|
File.open(target_file, "wb") do |saved_file|
|
78
86
|
open(opts["url"], "rb") do |read_file|
|
79
87
|
saved_file.write(read_file.read)
|
data/lib/aethernal_agent/apt.rb
CHANGED
data/lib/aethernal_agent/plugins/bazarr/{files/bazarr.service → templates/bazarr.service.erb}
RENAMED
@@ -7,7 +7,11 @@ UMask=0002
|
|
7
7
|
Restart=on-failure
|
8
8
|
RestartSec=5
|
9
9
|
Type=simple
|
10
|
+
<% if @ubuntu_version == "2004" %>
|
11
|
+
ExecStart=/usr/bin/python3.8 %h/apps/bazarr/bazarr.py -c %h/.config/bazarr/data
|
12
|
+
<% else %>
|
10
13
|
ExecStart=/usr/bin/python3.7 %h/apps/bazarr/bazarr.py -c %h/.config/bazarr/data
|
14
|
+
<% end %>
|
11
15
|
KillSignal=SIGINT
|
12
16
|
TimeoutStopSec=20
|
13
17
|
SyslogIdentifier=bazarr
|
@@ -6,6 +6,7 @@ class AethernalAgent::Gitea < AethernalAgent::App
|
|
6
6
|
def install_packages(options = {})
|
7
7
|
super(options)
|
8
8
|
file(gitea_path, chmod: 711, owner: self.user)
|
9
|
+
file(File.join(gitea_path, 'gitea'), chmod: 711, owner: self.user)
|
9
10
|
end
|
10
11
|
|
11
12
|
def remove_app_user(options = {})
|
@@ -48,7 +48,7 @@ estimated_size_mb: 18
|
|
48
48
|
package:
|
49
49
|
folder_name: jackett
|
50
50
|
direct_download:
|
51
|
-
url: https://github.com/Jackett/Jackett/releases/download/v0.
|
51
|
+
url: https://github.com/Jackett/Jackett/releases/download/v0.17.933/Jackett.Binaries.LinuxAMDx64.tar.gz
|
52
52
|
target_name: Jackett.Binaries.LinuxAMDx64.tar.gz
|
53
53
|
auto_extract: true
|
54
54
|
always_latest: false
|
@@ -41,10 +41,16 @@ estimated_size_mb: 295
|
|
41
41
|
package:
|
42
42
|
folder_name: nextcloud
|
43
43
|
direct_download:
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
44
|
+
"1804":
|
45
|
+
url: https://download.nextcloud.com/server/releases/nextcloud-18.0.4.tar.bz2
|
46
|
+
target_name: nextcloud-18.0.4.tar.bz2
|
47
|
+
auto_extract: true
|
48
|
+
always_latest: false
|
49
|
+
"2004":
|
50
|
+
url: https://download.nextcloud.com/server/releases/nextcloud-21.0.2.tar.bz2
|
51
|
+
target_name: nextcloud-21.0.2.tar.bz2
|
52
|
+
auto_extract: true
|
53
|
+
always_latest: false
|
48
54
|
apt:
|
49
55
|
"1804":
|
50
56
|
packages:
|
@@ -52,3 +58,9 @@ package:
|
|
52
58
|
- php-sqlite3
|
53
59
|
- php7.2-gd php7.2-json php7.2-mysql php7.2-curl php7.2-mbstring
|
54
60
|
- php7.2-intl php-imagick php7.2-xml php7.2-zip
|
61
|
+
"2004":
|
62
|
+
packages:
|
63
|
+
- libapache2-mod-php7.4
|
64
|
+
- php-sqlite3
|
65
|
+
- php7.4-gd php7.4-json php7.4-mysql php7.4-curl php7.4-mbstring
|
66
|
+
- php7.4-intl php-imagick php7.4-xml php7.4-zip
|
@@ -1,10 +1,10 @@
|
|
1
1
|
class AethernalAgent::Nextcloud < AethernalAgent::App
|
2
2
|
def initialize(options = {})
|
3
|
-
options[:home] = home_folder_path
|
4
3
|
super(options)
|
5
4
|
end
|
6
5
|
|
7
6
|
def install_packages(options = {})
|
7
|
+
options[:home] = home_folder_path
|
8
8
|
remove_app_user
|
9
9
|
super(options)
|
10
10
|
directory(home_folder_path("/www"), action: :create)
|
@@ -48,3 +48,10 @@ package:
|
|
48
48
|
key_url: "https://downloads.plex.tv/plex-keys/PlexSign.key"
|
49
49
|
packages:
|
50
50
|
- plexmediaserver
|
51
|
+
"2004":
|
52
|
+
add_sources:
|
53
|
+
plex:
|
54
|
+
source_url: "deb https://downloads.plex.tv/repo/deb public main"
|
55
|
+
key_url: "https://downloads.plex.tv/plex-keys/PlexSign.key"
|
56
|
+
packages:
|
57
|
+
- plexmediaserver
|
@@ -65,3 +65,11 @@ package:
|
|
65
65
|
packages:
|
66
66
|
- mono-devel
|
67
67
|
- mediainfo
|
68
|
+
"2004":
|
69
|
+
add_sources:
|
70
|
+
mono_stable:
|
71
|
+
source_url: "deb https://download.mono-project.com/repo/ubuntu stable-focal main"
|
72
|
+
key_id: "3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
|
73
|
+
packages:
|
74
|
+
- mono-devel
|
75
|
+
- mediainfo
|
@@ -26,13 +26,13 @@ class AethernalAgent::Tautulli < AethernalAgent::App
|
|
26
26
|
tautulli_config_path: tautulli_config_path,
|
27
27
|
password: opts['password'],
|
28
28
|
user: self.user}
|
29
|
-
|
30
|
-
write_template(template_path('config.ini.erb'),
|
31
|
-
tautulli_config_path('config.ini'),
|
32
|
-
@vars,
|
33
|
-
{owner: self.user})
|
34
29
|
end
|
35
30
|
|
31
|
+
write_template(template_path('config.ini.erb'),
|
32
|
+
tautulli_config_path('config.ini'),
|
33
|
+
@vars,
|
34
|
+
{owner: self.user})
|
35
|
+
|
36
36
|
return create_return_args(@vars)
|
37
37
|
end
|
38
38
|
|
@@ -182,19 +182,19 @@ home_stats_count = 5
|
|
182
182
|
cleanup_files = 0
|
183
183
|
check_github_on_startup = 1
|
184
184
|
http_port = <%= @port %>
|
185
|
-
log_dir = <%= @tautulli_config_path %>/logs
|
185
|
+
log_dir = <%= @tautulli_config_path %>/data/logs
|
186
186
|
update_db_interval = 24
|
187
187
|
interface = default
|
188
188
|
pms_ssl = 0
|
189
189
|
git_path = ""
|
190
190
|
home_stats_cards = "watch_statistics, top_tv, popular_tv, top_movies, popular_movies, top_music, popular_music, top_users, top_platforms, last_watched"
|
191
191
|
time_format = HH:mm
|
192
|
-
cache_dir = <%= @tautulli_config_path %>/cache
|
193
|
-
https_cert = <%= @tautulli_config_path %>/server.crt
|
192
|
+
cache_dir = <%= @tautulli_config_path %>/data/cache
|
193
|
+
https_cert = <%= @tautulli_config_path %>/data/server.crt
|
194
194
|
api_key = ""
|
195
195
|
date_format = YYYY-MM-DD
|
196
196
|
home_stats_type = 0
|
197
|
-
https_key = <%= @tautulli_config_path %>/server.key
|
197
|
+
https_key = <%= @tautulli_config_path %>/data/server.key
|
198
198
|
git_user = drzoidberg33
|
199
199
|
home_library_cards = library_statistics_first
|
200
200
|
git_branch = master
|
data/lib/aethernal_agent/plugins/tautulli/{files/tautulli.service → templates/tautulli.service.erb}
RENAMED
@@ -4,7 +4,7 @@ After=syslog.target network.target
|
|
4
4
|
|
5
5
|
[Service]
|
6
6
|
Type=simple
|
7
|
-
ExecStart
|
7
|
+
ExecStart=/usr/bin/python3 %h/apps/tautulli/Tautulli.py --config=%h/.config/tautulli/config.ini --datadir=%h/.config/tautulli/data
|
8
8
|
TimeoutStopSec=20
|
9
9
|
KillMode=process
|
10
10
|
Restart=on-failure
|
@@ -50,7 +50,6 @@ module AethernalAgent
|
|
50
50
|
return true
|
51
51
|
end
|
52
52
|
|
53
|
-
|
54
53
|
def wait_on_file(path, tries = 20)
|
55
54
|
AethernalAgent.logger.info("Waiting on file #{path} to exist")
|
56
55
|
|
@@ -146,7 +145,10 @@ module AethernalAgent
|
|
146
145
|
end
|
147
146
|
|
148
147
|
def ubuntu_release
|
149
|
-
|
148
|
+
AethernalAgent.logger.debug("Looking for Linux version number.")
|
149
|
+
version_number = %x( lsb_release -sr )
|
150
|
+
AethernalAgent.logger.debug("Returning version number: #{version_number.to_s.gsub('.', '')}")
|
151
|
+
version_number.to_s.gsub('.', '').strip
|
150
152
|
end
|
151
153
|
|
152
154
|
def prepare_test_config
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: aethernal-agent
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.5.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Maran
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-06-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -238,10 +238,10 @@ files:
|
|
238
238
|
- lib/aethernal_agent/operation.rb
|
239
239
|
- lib/aethernal_agent/operation_pool.rb
|
240
240
|
- lib/aethernal_agent/plugins/bazarr/bazarr.rb
|
241
|
-
- lib/aethernal_agent/plugins/bazarr/files/bazarr.service
|
242
241
|
- lib/aethernal_agent/plugins/bazarr/manifest.yml
|
243
242
|
- lib/aethernal_agent/plugins/bazarr/meta/bazarr.png
|
244
243
|
- lib/aethernal_agent/plugins/bazarr/templates/bazarr.apache.conf.erb
|
244
|
+
- lib/aethernal_agent/plugins/bazarr/templates/bazarr.service.erb
|
245
245
|
- lib/aethernal_agent/plugins/bazarr/templates/config.ini.erb
|
246
246
|
- lib/aethernal_agent/plugins/cardigann/cardigann.rb
|
247
247
|
- lib/aethernal_agent/plugins/cardigann/files/cardigann.service
|
@@ -373,12 +373,12 @@ files:
|
|
373
373
|
- lib/aethernal_agent/plugins/syncthing/syncthing.rb
|
374
374
|
- lib/aethernal_agent/plugins/syncthing/templates/config.xml.erb
|
375
375
|
- lib/aethernal_agent/plugins/syncthing/templates/syncthing.apache.conf.erb
|
376
|
-
- lib/aethernal_agent/plugins/tautulli/files/tautulli.service
|
377
376
|
- lib/aethernal_agent/plugins/tautulli/manifest.yml
|
378
377
|
- lib/aethernal_agent/plugins/tautulli/meta/tautulli.png
|
379
378
|
- lib/aethernal_agent/plugins/tautulli/tautulli.rb
|
380
379
|
- lib/aethernal_agent/plugins/tautulli/templates/config.ini.erb
|
381
380
|
- lib/aethernal_agent/plugins/tautulli/templates/tautulli.apache.conf.erb
|
381
|
+
- lib/aethernal_agent/plugins/tautulli/templates/tautulli.service.erb
|
382
382
|
- lib/aethernal_agent/plugins/vnc/files/xstartup
|
383
383
|
- lib/aethernal_agent/plugins/vnc/manifest.yml
|
384
384
|
- lib/aethernal_agent/plugins/vnc/meta/vnc.png
|
@@ -411,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
411
411
|
- !ruby/object:Gem::Version
|
412
412
|
version: '0'
|
413
413
|
requirements: []
|
414
|
-
rubygems_version: 3.2.
|
414
|
+
rubygems_version: 3.2.18
|
415
415
|
signing_key:
|
416
416
|
specification_version: 4
|
417
417
|
summary: Aethernal Agent for Aethernal.host.
|