5 files changed, 19 insertions, 14 deletions
diff --git a/modules/bcd/templates/.htaccess b/modules/bcd/templates/.htaccess
deleted file mode 100644
index 63631312..00000000
--- a/modules/bcd/templates/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-AuthUserFile <%= bcd_home %>/public_html/.htpasswd
-AuthGroupFile /dev/null
-AuthName "Restricted acces! For a RSYNC account, please mail your 'Mageia Identity' login to dams@mageia.org"
-AuthType Basic
-require valid-user
diff --git a/modules/bcd/templates/.htpasswd b/modules/bcd/templates/.htpasswd
deleted file mode 100644
index 457a13a7..00000000
--- a/modules/bcd/templates/.htpasswd
+++ /dev/null
@@ -1,2 +0,0 @@
-valstar:42Mx5EawIqVTY
-
diff --git a/modules/bcd/templates/rsyncd.conf b/modules/bcd/templates/rsyncd.conf
index 669eaf3d..75c7d335 100644
--- a/modules/bcd/templates/rsyncd.conf
+++ b/modules/bcd/templates/rsyncd.conf
@@ -4,6 +4,9 @@ uid = nobody
 gid = nogroup
 
 [isos]
-    path = <%= public_isos %>
+    path = <%= scope.lookupvar("bcd::public_isos") %>
     comment = Mageia ISOs
     exclude = .htaccess .htpasswd
+    read only = yes
+    auth users = isoqa
+    secrets file = /etc/rsyncd.secrets
diff --git a/modules/bcd/templates/sudoers.bcd b/modules/bcd/templates/sudoers.bcd
index 5649a24f..c462bffd 100644
--- a/modules/bcd/templates/sudoers.bcd
+++ b/modules/bcd/templates/sudoers.bcd
@@ -1,8 +1,10 @@
-<%= bcd_login %> ALL=(root) NOPASSWD:/bin/mount, /bin/umount, \
+<%= scope.lookupvar('bcd::login') %> ALL=(root) NOPASSWD:/bin/mount, /bin/umount, \
 /usr/sbin/chroot, \
 /usr/sbin/urpmi, \
 /usr/sbin/urpmi.addmedia, \
 /usr/sbin/urpmi.removemedia, \
+/usr/sbin/urpmi.update, \
+/usr/bin/urpmq, \
 /bin/rm
 
-%<%= isomakers_group %> ALL=(<%= bcd_login %>) SETENV: NOPASSWD: ALL
+%<%= @isomakers_group %> ALL=(<%= scope.lookupvar('bcd::login') %>) SETENV: NOPASSWD: ALL
diff --git a/modules/bcd/templates/vhost_bcd.conf b/modules/bcd/templates/vhost_bcd.conf
index 93d5c00c..c89955e2 100644
--- a/modules/bcd/templates/vhost_bcd.conf
+++ b/modules/bcd/templates/vhost_bcd.conf
@@ -1,5 +1,12 @@
-<Directory <%= bcd_home %>/public_html>
-  AllowOverride All
-  Options FollowSymlinks
-  Options Indexes
+<Directory <%= @location %>>
+    AuthUserFile <%= scope.lookupvar('bcd::home') %>/htpasswd
+    AuthGroupFile /dev/null
+    AuthName "QA test isos, restricted access"
+    ErrorDocument 403  "For the password, please contact the QA team ( https://wiki.<%= @domain %>/en/QA_Team )"
+
+    AuthType Basic
+    require valid-user
+
+    Options FollowSymlinks
+    Options Indexes
 </Directory>