Merge branch 'main' into fix/1947_display_ip

UPC · May 29, 2023 · 91798e0 · 91798e0
2 parents 0ef7ac5 + c7a6125
commit 91798e0
Show file tree

Hide file tree

Showing 79 changed files with 4,573 additions and 501 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,5 @@
 
 **Bugfixes**
 
-- Ubuntu Server installer [\#1944]
-- Ubuntu Desktop requires 4 GB RAM
-
 **Refactors**
 
diff --git a/etc/repository/iso/ru/astra.yml b/etc/repository/iso/ru/astra.yml
@@ -1,8 +1,7 @@
 name: Astra Linux 2.12
 description: Astra Linux Orel 2 64 bits
 url: https://mirrors.edge.kernel.org/astra/stable/2.12_x86-64/iso/
-file_re: orel-2..*\d.iso
-md5_url: $url/orel-2.*md5
+file_re: orel-current.iso
 arch: amd64
 xml: bionic-amd64.xml
 xml_volume: bionic64-volume.xml

diff --git a/etc/rvd_front.conf.example b/etc/rvd_front.conf.example
@@ -31,7 +31,7 @@
   ,session_timeout_admin2 => 60*60
 
   ,auto_view => 0
-  ,fallback => 0
+  ,fallback => 1
   ,log => {
       log => 0
       ,file => '/var/log/ravada/rvd_front.log'

diff --git a/etc/systemd/rvd_back.service b/etc/systemd/rvd_back.service
@@ -10,6 +10,8 @@ RemainAfterExit=yes
 SyslogIdentifier=rvd_back
 PIDFile=/var/run/rvd_back.pid
 ExecStart=/usr/sbin/rvd_back &
+Restart=on-failure
+RestartSec=5s
 
 [Install]
 WantedBy=multi-user.target

diff --git a/etc/systemd/rvd_front.service b/etc/systemd/rvd_front.service
@@ -11,6 +11,8 @@ SyslogIdentifier=rvd_front
 ExecStart=/usr/bin/hypnotoad /usr/sbin/rvd_front -f
 ExecStop=/usr/bin/hypnotoad -s /usr/sbin/rvd_front
 ExecReload=/usr/bin/hypnotoad /usr/sbin/rvd_front
+Restart=on-failure
+RestartSec=5s
 
 [Install]
 WantedBy=multi-user.target