console/rsync_server: Move rsyncd.conf contents to data directory

m-dati · Aug 24, 2023 · 56eeb86 · 56eeb86
1 parent 6e44e94
commit 56eeb86
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/data/console/rsyncd.conf b/data/console/rsyncd.conf
@@ -0,0 +1,14 @@
+max connections = 2
+log file = /var/log/rsync.log
+timeout = 300
+
+[pub]
+     comment = Testing files available for download
+     read only = yes
+     list = yes
+     path = /srv/rsync_test/pub
+     uid = nobody
+     gid = nobody
+     auth users = test42
+     secrets file = /etc/rsyncd.secrets
+
diff --git a/tests/console/rsync_server.pm b/tests/console/rsync_server.pm
@@ -27,24 +27,7 @@ sub run {
     select_console 'root-console';
 
     #preparation of rsync config files
-    script_run 'cat > /etc/rsyncd.conf <<EOF
-max connections = 2
-log file = /var/log/rsync.log
-timeout = 300
-
-[pub]
-     comment = Testing files available for download
-     read only = yes
-     list = yes
-     path = /srv/rsync_test/pub
-     uid = nobody
-     gid = nobody
-     auth users = test42
-     secrets file = /etc/rsyncd.secrets
-
-EOF
-true';
-
+    assert_script_run('curl -v -o /etc/rsyncd.conf ' . data_url('console/rsyncd.conf'));
     assert_script_run 'echo "test42:424242" > /etc/rsyncd.secrets';
 
     if (is_sle('<12-sp5')) {    #using xinetd on sle 12