diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 17:51:42 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 17:51:42 +0300 |
| commit | c61daf65b58b943994d1f21e52deee9a9ce04827 (patch) | |
| tree | ffeb83234cb01580abe04217f8b8eca9698d5424 /modules/buildsystem/manifests | |
| parent | c4cb8478752701a83c4e3b4b73d661e188d67daa (diff) | |
| download | puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.gz puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.bz2 puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.xz puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.zip | |
use consistent domain references
Diffstat (limited to 'modules/buildsystem/manifests')
| -rw-r--r-- | modules/buildsystem/manifests/release.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/maintdb.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/webstatus.pp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/modules/buildsystem/manifests/release.pp b/modules/buildsystem/manifests/release.pp index c1ff6988..485096f7 100644 --- a/modules/buildsystem/manifests/release.pp +++ b/modules/buildsystem/manifests/release.pp @@ -1,6 +1,6 @@ class buildsystem::release { git::snapshot { '/root/release': - source => "git://git.$::domain/software/infrastructure/release", + source => "git://git.${::domain}/software/infrastructure/release", } package { 'hardlink': } diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index ca4bbdb8..aa303191 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -75,7 +75,7 @@ # # list of IP or hostnames allowed to access this distro on the # # repository. If you don't want to filter allowed IPs, don't set # # this value -# 'repo_allow_from' => [ '127.0.0.1', '10.0.0.1', '.mageia.org' ], +# 'repo_allow_from' => [ '127.0.0.1', '10.0.0.1', ".${::domain}" ], # Optionally, the distribution can be based on the repos from an other # distribution. In this example we're saying that the distribution is # based on 2/core/release and 2/core/updates. diff --git a/modules/buildsystem/manifests/var/maintdb.pp b/modules/buildsystem/manifests/var/maintdb.pp index 0c3562a1..e0079e40 100644 --- a/modules/buildsystem/manifests/var/maintdb.pp +++ b/modules/buildsystem/manifests/var/maintdb.pp @@ -1,5 +1,5 @@ class buildsystem::var::maintdb( - $hostname = "maintdb.$::domain", + $hostname = "maintdb.${::domain}", $login = 'maintdb', $homedir = '/var/lib/maintdb' ) { diff --git a/modules/buildsystem/manifests/var/webstatus.pp b/modules/buildsystem/manifests/var/webstatus.pp index c3891d9e..21f8d59f 100644 --- a/modules/buildsystem/manifests/var/webstatus.pp +++ b/modules/buildsystem/manifests/var/webstatus.pp @@ -14,8 +14,8 @@ # path of the directory where the themes are located. If you want # to use a theme not included in webstatus, you need to change this. class buildsystem::var::webstatus( - $git_url = "git://git.mageia.org/web/pkgsubmit", - $hostname = "pkgsubmit.$::domain", + $git_url = "git://git.${::domain}/web/pkgsubmit", + $hostname = "pkgsubmit.${::domain}", $location = '/var/www/bs', $package_commit_url, $max_modified = '2', |