diff options
Diffstat (limited to 'modules')
31 files changed, 47 insertions, 46 deletions
diff --git a/modules/bcd/manifests/web.pp b/modules/bcd/manifests/web.pp index 97c697e5..d670cf5d 100644 --- a/modules/bcd/manifests/web.pp +++ b/modules/bcd/manifests/web.pp @@ -2,7 +2,7 @@ class bcd::web { include bcd::base $location = "${bcd::home}/public_html" - apache::vhost::base { "bcd.$::domain": + apache::vhost::base { "bcd.${::domain}": location => $location, content => template('bcd/vhost_bcd.conf'), } diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index 08d86d0b..61018f73 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -1,11 +1,11 @@ class blog { class base { - $blog_domain = "blog.$::domain" + $blog_domain = "blog.${::domain}" $blog_location = "/var/www/vhosts/${blog_domain}" $blog_db_backupdir = '/var/lib/backups/blog_db' $blog_files_backupdir = '/var/lib/backups/blog_files' - $blog_newpost_email_to = 'i18n-reports@ml.mageia.org' - $blog_newpost_email_from = 'Mageia Blog bot <blog@mageia.org>' + $blog_newpost_email_to = "i18n-reports@ml.${::domain}" + $blog_newpost_email_from = "Mageia Blog bot <blog@${::domain}>" user { 'blog': groups => apache, diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp index 188cb0b7..06c53abc 100644 --- a/modules/bugzilla/manifests/init.pp +++ b/modules/bugzilla/manifests/init.pp @@ -36,7 +36,7 @@ class bugzilla { webapp_file => 'bugzilla/webapp_bugzilla.conf', } - $bugs_vhost = "bugs.$::domain" + $bugs_vhost = "bugs.${::domain}" $vhost_root = '/usr/share/bugzilla/www' apache::vhost::redirect_ssl { $bugs_vhost: } @@ -50,7 +50,7 @@ class bugzilla { } git::snapshot { $extension_location: - source => "git://git.$::domain/web/templates/bugzilla", + source => "git://git.${::domain}/web/templates/bugzilla", require => Package['bugzilla'], } 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', diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp index 41ba5d13..a0f83ad1 100644 --- a/modules/catdap/manifests/init.pp +++ b/modules/catdap/manifests/init.pp @@ -1,6 +1,6 @@ class catdap { - $upstream_git = 'git://git.mageia.org/web/identity' + $upstream_git = "git://git.${::domain}/web/identity" # TODO switch to a proper rpm packaging $rpm_requirement = ['perl-Catalyst-Runtime', @@ -36,13 +36,13 @@ class catdap { $ldap_password = extlookup('catdap_ldap','x') - catdap::snapshot { "identity.$::domain": + catdap::snapshot { "identity.${::domain}": location => '/var/www/identity', git_location => $upstream_git, git_branch => 'topic/production', } - catdap::snapshot { "identity-trunk.$::domain": + catdap::snapshot { "identity-trunk.${::domain}": location => '/var/www/identity-trunk', git_location => $upstream_git, } diff --git a/modules/cgit/manifests/init.pp b/modules/cgit/manifests/init.pp index a7591813..58b80ede 100644 --- a/modules/cgit/manifests/init.pp +++ b/modules/cgit/manifests/init.pp @@ -15,7 +15,7 @@ class cgit { content => template('cgit/filter.commit-links.sh'), } - apache::vhost::base { "gitweb.$::domain": + apache::vhost::base { "gitweb.${::domain}": content => template('cgit/vhost.conf') } } diff --git a/modules/dashboard/manifests/init.pp b/modules/dashboard/manifests/init.pp index c3216cbb..34ef41b3 100644 --- a/modules/dashboard/manifests/init.pp +++ b/modules/dashboard/manifests/init.pp @@ -3,7 +3,7 @@ class dashboard { $dashboard_home_dir = "/var/lib/${dashboard_login}" $dashboard_dir = "${dashboard_home_dir}/dashboard" $dashboard_bindir = "${dashboard_home_dir}/bin" - $dashboard_wwwdir = "/var/www/vhosts/dashboard.$::domain" + $dashboard_wwwdir = "/var/www/vhosts/dashboard.${::domain}" user { $dashboard_login: comment => 'dashboard system user', @@ -11,7 +11,7 @@ class dashboard { } git::snapshot { $dashboard_dir: - source => "git://git.$::domain/web/generators/dashboard", + source => "git://git.${::domain}/web/generators/dashboard", } package { 'php-cli': } @@ -31,7 +31,7 @@ class dashboard { content => template('dashboard/make_report'), } - apache::vhost::base { "dashboard.$::domain": + apache::vhost::base { "dashboard.${::domain}": location => $dashboard_wwwdir, } diff --git a/modules/draklive/manifests/init.pp b/modules/draklive/manifests/init.pp index 0fce54ab..1800b6fd 100644 --- a/modules/draklive/manifests/init.pp +++ b/modules/draklive/manifests/init.pp @@ -34,7 +34,7 @@ class draklive { } git::snapshot { $config: - source => "git://git.$::domain/software/build-system/draklive-config", + source => "git://git.${::domain}/software/build-system/draklive-config", } cron { 'build live images': diff --git a/modules/epoll/manifests/var.pp b/modules/epoll/manifests/var.pp index 552c2b27..e99239ce 100644 --- a/modules/epoll/manifests/var.pp +++ b/modules/epoll/manifests/var.pp @@ -20,7 +20,7 @@ # password to connect to the database # class epoll::var ( - $vhost = "epoll.$::domain", + $vhost = "epoll.${::domain}", $db_hostname = 'localhost', $db_name = 'epoll', $db_user = 'epoll', diff --git a/modules/mediawiki/manifests/config.pp b/modules/mediawiki/manifests/config.pp index 1375ea0b..559f897d 100644 --- a/modules/mediawiki/manifests/config.pp +++ b/modules/mediawiki/manifests/config.pp @@ -5,5 +5,5 @@ class mediawiki::config( $pgsql_password, $secretkey, $ldap_password, - $vhost = "wiki.$::domain", + $vhost = "wiki.${::domain}", $root = '/srv/wiki/') {} diff --git a/modules/mga-advisories/manifests/init.pp b/modules/mga-advisories/manifests/init.pp index 582b2aae..56929b6a 100644 --- a/modules/mga-advisories/manifests/init.pp +++ b/modules/mga-advisories/manifests/init.pp @@ -1,5 +1,5 @@ class mga-advisories( - $advisories_svn = 'svn://svn.mageia.org/svn/advisories', + $advisories_svn = "svn://svn.${::domain}/svn/advisories", $vhost ){ $mgaadv_login = 'mga-advisories' diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp index 7bdad67e..be4da721 100644 --- a/modules/mga-mirrors/manifests/init.pp +++ b/modules/mga-mirrors/manifests/init.pp @@ -1,6 +1,6 @@ class mga-mirrors { - $vhost = "mirrors.$::domain" + $vhost = "mirrors.${::domain}" package { 'mga-mirrors': } diff --git a/modules/mga-treasurer/manifests/init.pp b/modules/mga-treasurer/manifests/init.pp index d41b518e..d092e982 100644 --- a/modules/mga-treasurer/manifests/init.pp +++ b/modules/mga-treasurer/manifests/init.pp @@ -1,5 +1,5 @@ class mga-treasurer( - $grisbi_git = "git://git.$::domain/org/accounts", + $grisbi_git = "git://git.${::domain}/org/accounts", $grisbi_filename = 'mageia-accounts.gsb', $vhost, $vhostdir diff --git a/modules/mgapeople/manifests/init.pp b/modules/mgapeople/manifests/init.pp index c2b0e81d..7c40ab9c 100644 --- a/modules/mgapeople/manifests/init.pp +++ b/modules/mgapeople/manifests/init.pp @@ -1,5 +1,5 @@ class mgapeople( - $site_name = 'people.mageia.org', + $site_name = "people.${::domain}", $groupbase = 'ou=Group,dc=mageia,dc=org', $maintdburl = undef, $ldap_server, diff --git a/modules/mgasoft/manifests/init.pp b/modules/mgasoft/manifests/init.pp index d178ebfc..956ea978 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', diff --git a/modules/mirror/manifests/mageia.pp b/modules/mirror/manifests/mageia.pp index 4b39ccb8..c14a09bb 100644 --- a/modules/mirror/manifests/mageia.pp +++ b/modules/mirror/manifests/mageia.pp @@ -1,7 +1,7 @@ class mirror::mageia { include mirror::base mirrordir { 'mageia': - remoteurl => "rsync://rsync.$::domain/mageia", + remoteurl => "rsync://rsync.${::domain}/mageia", localdir => '/distrib/mageia', } } diff --git a/modules/openldap/manifests/init.pp b/modules/openldap/manifests/init.pp index 35455d1a..b04379b9 100644 --- a/modules/openldap/manifests/init.pp +++ b/modules/openldap/manifests/init.pp @@ -3,7 +3,7 @@ class openldap { service { 'ldap': subscribe => Package['openldap-servers'], - require => Openssl::Self_signed_cert["ldap.$::domain"], + require => Openssl::Self_signed_cert["ldap.${::domain}"], } exec { '/etc/init.d/ldap check': @@ -15,7 +15,7 @@ class openldap { ensure => directory, } - openssl::self_signed_cert{ "ldap.$::domain": + openssl::self_signed_cert{ "ldap.${::domain}": directory => '/etc/ssl/openldap/', } diff --git a/modules/phpbb/manifests/base.pp b/modules/phpbb/manifests/base.pp index 115c4592..c2328ac2 100644 --- a/modules/phpbb/manifests/base.pp +++ b/modules/phpbb/manifests/base.pp @@ -31,13 +31,13 @@ class phpbb::base { } # TODO check that everything is locked down - apache::vhost::base { "forums.$::domain": + apache::vhost::base { "forums.${::domain}": content => template('phpbb/forums_vhost.conf'), } - apache::vhost::base { "ssl_forums.$::domain": + apache::vhost::base { "ssl_forums.${::domain}": use_ssl => true, - vhost => "forums.$::domain", + vhost => "forums.${::domain}", content => template('phpbb/forums_vhost.conf'), } diff --git a/modules/phpbb/manifests/config.pp b/modules/phpbb/manifests/config.pp index 90e01f5e..7d84ff54 100644 --- a/modules/phpbb/manifests/config.pp +++ b/modules/phpbb/manifests/config.pp @@ -5,7 +5,7 @@ define phpbb::config($key, $value, $database) { environment => ["PGDATABASE=${database}", "PGUSER=$phpbb::base::user", "PGPASSWORD=$phpbb::base::pgsql_password", - "PGHOST=pgsql.$::domain", + "PGHOST=pgsql.${::domain}", "VALUE=$value"], require => File['/usr/local/bin/phpbb_apply_config.pl'], } diff --git a/modules/phpbb/manifests/instance.pp b/modules/phpbb/manifests/instance.pp index 486b2d3a..e717ea7f 100644 --- a/modules/phpbb/manifests/instance.pp +++ b/modules/phpbb/manifests/instance.pp @@ -10,7 +10,7 @@ define phpbb::instance() { include git::client exec { "git_clone ${lang}": - command =>"git clone git://git.$::domain/web/forums/ ${lang}", + command =>"git clone git://git.${::domain}/web/forums/ ${lang}", cwd => $forums_dir, creates => "${forums_dir}/${lang}", require => File[$forums_dir], @@ -59,7 +59,7 @@ define phpbb::instance() { "ldap_user/${lang}": key => 'ldap_user', value => "cn=phpbb-$::hostname,ou=System Accounts,$::dc_suffix"; "ldap_server/${lang}": - key => 'ldap_server', value => "ldaps://ldap.$::domain ldaps://ldap-slave-1.$::domain"; + key => 'ldap_server', value => "ldaps://ldap.${::domain} ldaps://ldap-slave-1.${::domain}"; "ldap_password/${lang}": key => 'ldap_password', value => $ldap_password; "ldap_base_dn/${lang}": @@ -71,9 +71,9 @@ define phpbb::instance() { "ldap_uid/${lang}": key => 'ldap_uid', value => 'uid'; "cookie_domain/${lang}": - key => 'cookie_domain', value => "forums.$::domain"; + key => 'cookie_domain', value => "forums.${::domain}"; "server_name/${lang}": - key => 'server_name', value => "forums.$::domain"; + key => 'server_name', value => "forums.${::domain}"; "default_lang/${lang}": key => 'default_lang', value => $lang; } diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp index a5e930b5..88e36a6f 100644 --- a/modules/planet/manifests/init.pp +++ b/modules/planet/manifests/init.pp @@ -6,7 +6,7 @@ class planet { home => '/var/lib/planet', } - $vhost = "planet.$::domain" + $vhost = "planet.${::domain}" $location = "/var/www/vhosts/${vhost}" include apache::mod::php diff --git a/modules/postfix/manifests/server/primary.pp b/modules/postfix/manifests/server/primary.pp index 3f089685..45b8fda6 100644 --- a/modules/postfix/manifests/server/primary.pp +++ b/modules/postfix/manifests/server/primary.pp @@ -3,6 +3,7 @@ class postfix::server::primary inherits postfix::server { package { 'postfix-ldap': } # council is here until we fully decide who has aliases in com team, + # see https://bugs.mageia.org/show_bug.cgi?id=1345 # alumini is a special group for tracking previous members of # the project, so they keep their aliases for a time diff --git a/modules/postgresql/manifests/server.pp b/modules/postgresql/manifests/server.pp index 29fa30d0..8b92bb2b 100644 --- a/modules/postgresql/manifests/server.pp +++ b/modules/postgresql/manifests/server.pp @@ -21,7 +21,7 @@ class postgresql::server { refreshonly => true, } - openssl::self_signed_splitted_cert { "pgsql.$::domain": + openssl::self_signed_splitted_cert { "pgsql.${::domain}": filename => 'server', directory => $postgresql::var::pgsql_data, owner => 'postgres', diff --git a/modules/sympa/manifests/server.pp b/modules/sympa/manifests/server.pp index 9df9f8ca..7eca4dca 100644 --- a/modules/sympa/manifests/server.pp +++ b/modules/sympa/manifests/server.pp @@ -57,7 +57,7 @@ class sympa::server( } git::snapshot { '/etc/sympa/web_tt2': - source => "git://git.$::domain/web/templates/sympa", + source => "git://git.${::domain}/web/templates/sympa", } file { ['/etc/sympa/lists_xml/', diff --git a/modules/sympa/manifests/variable.pp b/modules/sympa/manifests/variable.pp index 274c4bb8..26f60294 100644 --- a/modules/sympa/manifests/variable.pp +++ b/modules/sympa/manifests/variable.pp @@ -1,3 +1,3 @@ class sympa::variable { - $vhost = "ml.$::domain" + $vhost = "ml.${::domain}" } diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp index 51c57ca1..282b3f9a 100644 --- a/modules/transifex/manifests/init.pp +++ b/modules/transifex/manifests/init.pp @@ -32,10 +32,10 @@ class transifex { '50-project.conf']: } git::snapshot { $templates_dir: - source => "git://git.$::domain/web/templates/transifex" + source => "git://git.${::domain}/web/templates/transifex" } - apache::vhost::django_app { "transifex.$::domain": + apache::vhost::django_app { "transifex.${::domain}": module => 'transifex', use_ssl => true, module_path => ['/usr/share/transifex','/usr/share','/usr/local/lib/'], @@ -50,7 +50,7 @@ class transifex { require => Package['transifex'], } - apache::vhost::redirect_ssl { "transifex.$::domain": } + apache::vhost::redirect_ssl { "transifex.${::domain}": } # the group are mapped from ldap, since AUTH_LDAP_FIND_GROUP_PERMS is set to yes # but the group need to exist in django first diff --git a/modules/viewvc/manifests/var.pp b/modules/viewvc/manifests/var.pp index c2fcef5b..9027d808 100644 --- a/modules/viewvc/manifests/var.pp +++ b/modules/viewvc/manifests/var.pp @@ -3,7 +3,7 @@ # $tmpl_viewvc_conf: # path to /etc/viewvc.conf template file class viewvc::var( - $hostname = "svnweb.$::domain", + $hostname = "svnweb.${::domain}", $tmpl_viewvc_conf = 'viewvc/viewvc.conf' ) { } diff --git a/modules/youri-check/manifests/init.pp b/modules/youri-check/manifests/init.pp index 25d70875..a57b67e5 100644 --- a/modules/youri-check/manifests/init.pp +++ b/modules/youri-check/manifests/init.pp @@ -1,6 +1,6 @@ class youri-check { class base { - $vhost = "check.$domain" + $vhost = "check.${::domain}" $user = 'youri' $home = '/var/lib/youri' |