aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mgasoft
diff options
context:
space:
mode:
Diffstat (limited to 'modules/mgasoft')
-rw-r--r--modules/mgasoft/manifests/init.pp5
-rw-r--r--modules/mgasoft/templates/mgasoft.conf8
2 files changed, 6 insertions, 7 deletions
diff --git a/modules/mgasoft/manifests/init.pp b/modules/mgasoft/manifests/init.pp
index 68c54ba7..70431701 100644
--- a/modules/mgasoft/manifests/init.pp
+++ b/modules/mgasoft/manifests/init.pp
@@ -1,5 +1,5 @@
class mgasoft(
- $anonsvn_soft = 'svn://svn.mageia.org/svn/soft',
+ $anonsvn_soft = "svn://svn.${::domain}/svn/soft",
$pubinfodir = '/var/lib/mgasoft/infos',
$pubmirrordir = '/distrib/mirror/software',
$svn_soft_publish = 'file:///svn/soft_publish',
@@ -8,9 +8,8 @@ class mgasoft(
group { $mgasoft_login: }
user { $mgasoft_login:
- comment => 'System user to publish software',
managehome => true,
- home => "/var/lib/$mgasoft_login",
+ home => "/var/lib/${mgasoft_login}",
gid => $mgasoft_login,
require => Group[$mgasoft_login],
}
diff --git a/modules/mgasoft/templates/mgasoft.conf b/modules/mgasoft/templates/mgasoft.conf
index eaf6e416..81cce013 100644
--- a/modules/mgasoft/templates/mgasoft.conf
+++ b/modules/mgasoft/templates/mgasoft.conf
@@ -1,5 +1,5 @@
svn_soft=svn+ssh://svn.mageia.org/svn/soft
-anonsvn_soft=<%= anonsvn_soft %>
-svn_soft_publish=<%= svn_soft_publish %>
-pubinfodir=<%= pubinfodir %>
-pubmirrordir=<%= pubmirrordir %>
+anonsvn_soft=<%= @anonsvn_soft %>
+svn_soft_publish=<%= @svn_soft_publish %>
+pubinfodir=<%= @pubinfodir %>
+pubmirrordir=<%= @pubmirrordir %>