diff options
25 files changed, 28 insertions, 28 deletions
diff --git a/deployment/releasekey/manifests/init.pp b/deployment/releasekey/manifests/init.pp index 66f66b60..e1a174d5 100644 --- a/deployment/releasekey/manifests/init.pp +++ b/deployment/releasekey/manifests/init.pp @@ -21,7 +21,7 @@ class releasekey { require => User[$sign_login], } - mga-common::local_script { 'sign_checksums': + mga_common::local_script { 'sign_checksums': content => template('releasekey/sign_checksums'), } } diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index 6391e3de..1333fa1a 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -19,7 +19,7 @@ class blog { 'php-ldap', 'unzip']: } - mga-common::local_script { 'check_new-blog-post.sh': + mga_common::local_script { 'check_new-blog-post.sh': content => template('blog/check_new-blog-post.sh'), } @@ -56,7 +56,7 @@ class blog { ensure => directory, } - mga-common::local_script { 'backup_blog-db.sh': + mga_common::local_script { 'backup_blog-db.sh': content => template('blog/backup_blog-db.sh'), } @@ -74,7 +74,7 @@ class blog { ensure => directory, } - mga-common::local_script { 'backup_blog-files.sh': + mga_common::local_script { 'backup_blog-files.sh': content => template('blog/backup_blog-files.sh'), } diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp index 00f2d165..9e449627 100644 --- a/modules/buildsystem/manifests/binrepo.pp +++ b/modules/buildsystem/manifests/binrepo.pp @@ -18,7 +18,7 @@ class buildsystem::binrepo { owner => $buildsystem::var::binrepo::login, } - mga-common::local_script { + mga_common::local_script { 'upload-bin': content => template('buildsystem/binrepo/upload-bin'); 'wrapper.upload-bin': diff --git a/modules/buildsystem/manifests/maintdb.pp b/modules/buildsystem/manifests/maintdb.pp index 05f660b1..88920bd4 100644 --- a/modules/buildsystem/manifests/maintdb.pp +++ b/modules/buildsystem/manifests/maintdb.pp @@ -22,7 +22,7 @@ class buildsystem::maintdb { content => template('buildsystem/maintdb/maintdb.bin') } - mga-common::local_script { 'wrapper.maintdb': + mga_common::local_script { 'wrapper.maintdb': content => template('buildsystem/maintdb/wrapper.maintdb') } diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp index 8f11840e..6d91ddd6 100644 --- a/modules/buildsystem/manifests/signbot.pp +++ b/modules/buildsystem/manifests/signbot.pp @@ -25,7 +25,7 @@ class buildsystem::signbot { source => 'puppet:///modules/buildsystem/signbot/signbot-rpmmacros', } - mga-common::local_script { + mga_common::local_script { 'sign-check-package': source => 'puppet:///modules/buildsystem/signbot/sign-check-package'; 'mga-signpackage': source => 'puppet:///modules/buildsystem/signbot/mga-signpackage'; } diff --git a/modules/buildsystem/manifests/youri_submit.pp b/modules/buildsystem/manifests/youri_submit.pp index 32fc8243..efc1f2dd 100644 --- a/modules/buildsystem/manifests/youri_submit.pp +++ b/modules/buildsystem/manifests/youri_submit.pp @@ -5,7 +5,7 @@ class buildsystem::youri_submit { include buildsystem::var::scheduler include buildsystem::var::youri - mga-common::local_script { + mga_common::local_script { 'mga-youri-submit': content => template('buildsystem/mga-youri-submit'); 'mga-youri-submit.wrapper': @@ -50,15 +50,15 @@ class buildsystem::youri_submit { matches => '*.rpm', } - include mga-common::var::perl - file { [ "${mga-common::var::perl::site_perl_dir}/Youri", - "${mga-common::var::perl::site_perl_dir}/Youri/Repository"]: + include mga_common::var::perl + file { [ "${mga_common::var::perl::site_perl_dir}/Youri", + "${mga_common::var::perl::site_perl_dir}/Youri/Repository"]: ensure => directory, mode => 0755, owner => root, group => root, } - file { "${mga-common::var::perl::site_perl_dir}/Youri/Repository/Mageia.pm": + file { "${mga_common::var::perl::site_perl_dir}/Youri/Repository/Mageia.pm": source => 'puppet:///modules/buildsystem/Mageia.pm', } diff --git a/modules/cgit/manifests/init.pp b/modules/cgit/manifests/init.pp index 8166d385..a7591813 100644 --- a/modules/cgit/manifests/init.pp +++ b/modules/cgit/manifests/init.pp @@ -11,7 +11,7 @@ class cgit { webapp_file => 'cgit/webapp.conf', } - mga-common::local_script { 'cgit.filter.commit-links.sh': + mga_common::local_script { 'cgit.filter.commit-links.sh': content => template('cgit/filter.commit-links.sh'), } diff --git a/modules/gitweb/manifests/init.pp b/modules/gitweb/manifests/init.pp index 59e74657..3dc16350 100644 --- a/modules/gitweb/manifests/init.pp +++ b/modules/gitweb/manifests/init.pp @@ -15,7 +15,7 @@ class gitweb { webapp_file => 'gitweb/webapp.conf', } - mga-common::local_script { 'gitweb.wrapper.sh': + mga_common::local_script { 'gitweb.wrapper.sh': content => template('gitweb/wrapper.sh'), notify => Service['apache'], } diff --git a/modules/gnupg/manifests/client.pp b/modules/gnupg/manifests/client.pp index a032b323..ac123094 100644 --- a/modules/gnupg/manifests/client.pp +++ b/modules/gnupg/manifests/client.pp @@ -3,7 +3,7 @@ class gnupg::client { 'rng-utils']: } - mga-common::local_script { 'create_gnupg_keys.sh': + mga_common::local_script { 'create_gnupg_keys.sh': content => template('gnupg/create_gnupg_keys.sh') } } diff --git a/modules/ii/manifests/init.pp b/modules/ii/manifests/init.pp index a325d57b..ff45ab3d 100644 --- a/modules/ii/manifests/init.pp +++ b/modules/ii/manifests/init.pp @@ -17,7 +17,7 @@ class ii { include ii::base # a custom wrappper is needed since ii do not fork in the # background, and bash is not able to properly do it - mga-common::local_script { "ii_$nick": + mga_common::local_script { "ii_$nick": content => template('ii/ii_wrapper.pl'), require => Class['ii::base'], } diff --git a/modules/mga-common/lib/puppet/parser/functions/group_members.rb b/modules/mga_common/lib/puppet/parser/functions/group_members.rb index c5cecbe8..c5cecbe8 100644 --- a/modules/mga-common/lib/puppet/parser/functions/group_members.rb +++ b/modules/mga_common/lib/puppet/parser/functions/group_members.rb diff --git a/modules/mga-common/lib/puppet/parser/functions/hash_keys.rb b/modules/mga_common/lib/puppet/parser/functions/hash_keys.rb index 3a926bee..3a926bee 100644 --- a/modules/mga-common/lib/puppet/parser/functions/hash_keys.rb +++ b/modules/mga_common/lib/puppet/parser/functions/hash_keys.rb diff --git a/modules/mga-common/lib/puppet/parser/functions/hash_merge.rb b/modules/mga_common/lib/puppet/parser/functions/hash_merge.rb index 375bffa4..375bffa4 100644 --- a/modules/mga-common/lib/puppet/parser/functions/hash_merge.rb +++ b/modules/mga_common/lib/puppet/parser/functions/hash_merge.rb diff --git a/modules/mga-common/lib/puppet/parser/functions/str_join.rb b/modules/mga_common/lib/puppet/parser/functions/str_join.rb index de97bfb5..de97bfb5 100644 --- a/modules/mga-common/lib/puppet/parser/functions/str_join.rb +++ b/modules/mga_common/lib/puppet/parser/functions/str_join.rb diff --git a/modules/mga-common/manifests/local_script.pp b/modules/mga_common/manifests/local_script.pp index 213ba84e..70aad7b0 100644 --- a/modules/mga-common/manifests/local_script.pp +++ b/modules/mga_common/manifests/local_script.pp @@ -1,4 +1,4 @@ -define mga-common::local_script( +define mga_common::local_script( $content = undef, $source = undef, $owner = 'root', diff --git a/modules/mga-common/manifests/var/perl.pp b/modules/mga_common/manifests/var/perl.pp index 8ff160b1..47ff54be 100644 --- a/modules/mga-common/manifests/var/perl.pp +++ b/modules/mga_common/manifests/var/perl.pp @@ -1,3 +1,3 @@ -class mga-common::var::perl( +class mga_common::var::perl( $site_perl_dir = '/usr/lib/perl5/site_perl' ) {} diff --git a/modules/mirror/manifests/main.pp b/modules/mirror/manifests/main.pp index ebf1fa80..47b05fb9 100644 --- a/modules/mirror/manifests/main.pp +++ b/modules/mirror/manifests/main.pp @@ -1,7 +1,7 @@ # For main Mageia mirror class mirror::main { include mirror::base - mga-common::local_script { 'update_timestamp': + mga_common::local_script { 'update_timestamp': content => template('mirror/update_timestamp') } diff --git a/modules/mirror/manifests/mirrordir.pp b/modules/mirror/manifests/mirrordir.pp index 337bf678..749f4190 100644 --- a/modules/mirror/manifests/mirrordir.pp +++ b/modules/mirror/manifests/mirrordir.pp @@ -10,7 +10,7 @@ define mirror::mirrordir ($remoteurl, group => 'mirror', } - mga-common::local_script { "mirror_$name": + mga_common::local_script { "mirror_$name": content => template('mirror/mirrordir'), } diff --git a/modules/openldap/manifests/master.pp b/modules/openldap/manifests/master.pp index 49084922..d7f922c1 100644 --- a/modules/openldap/manifests/master.pp +++ b/modules/openldap/manifests/master.pp @@ -26,7 +26,7 @@ class openldap::master inherits openldap { # with data package { 'openldap-clients': } - mga-common::local_script { 'init_ldap.sh': + mga_common::local_script { 'init_ldap.sh': content => template('openldap/init_ldap.sh'), require => Package['openldap-clients'], } diff --git a/modules/openssh/manifests/ssh_keys_from_ldap.pp b/modules/openssh/manifests/ssh_keys_from_ldap.pp index e3170423..e1407c18 100644 --- a/modules/openssh/manifests/ssh_keys_from_ldap.pp +++ b/modules/openssh/manifests/ssh_keys_from_ldap.pp @@ -16,7 +16,7 @@ class openssh::ssh_keys_from_ldap($symlink_users = [], $ldap_pwfile = '/etc/ldap.secret' $ldap_servers = get_ldap_servers() - mga-common::local_script { 'ldap-sshkey2file.py': + mga_common::local_script { 'ldap-sshkey2file.py': content => template('openssh/ldap-sshkey2file.py'), require => Package['python-ldap'] } diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp index e0cbbca0..be35191f 100644 --- a/modules/planet/manifests/init.pp +++ b/modules/planet/manifests/init.pp @@ -17,7 +17,7 @@ class planet { content => template('planet/planet_vhosts.conf') } - mga-common::local_script { 'deploy_new-planet.sh': + mga_common::local_script { 'deploy_new-planet.sh': content => template('planet/deploy_new-planet.sh') } @@ -36,7 +36,7 @@ class planet { ensure => directory, } - mga-common::local_script { "backup_planet-files.sh": + mga_common::local_script { "backup_planet-files.sh": content => template("blog/backup_planet-files.sh") } diff --git a/modules/restrictshell/manifests/shell.pp b/modules/restrictshell/manifests/shell.pp index 77044ed4..3ef2a036 100644 --- a/modules/restrictshell/manifests/shell.pp +++ b/modules/restrictshell/manifests/shell.pp @@ -3,7 +3,7 @@ class restrictshell::shell { ensure => directory, } - mga-common::local_script { 'sv_membersh.pl': + mga_common::local_script { 'sv_membersh.pl': content => template('restrictshell/sv_membersh.pl'), } diff --git a/modules/subversion/manifests/init.pp b/modules/subversion/manifests/init.pp index 54dd776f..aa8b866b 100644 --- a/modules/subversion/manifests/init.pp +++ b/modules/subversion/manifests/init.pp @@ -26,7 +26,7 @@ class subversion { } # workaround the lack of umask command in puppet < 2.7 - mga-common::local_script { 'create_svn_repo.sh': + mga_common::local_script { 'create_svn_repo.sh': content => template('subversion/create_svn_repo.sh') } diff --git a/modules/subversion/manifests/mirror.pp b/modules/subversion/manifests/mirror.pp index 27741752..2285ecb2 100644 --- a/modules/subversion/manifests/mirror.pp +++ b/modules/subversion/manifests/mirror.pp @@ -1,6 +1,6 @@ class subversion::mirror { include subversion::tools - mga-common::local_script { 'create_svn_mirror.sh': + mga_common::local_script { 'create_svn_mirror.sh': content => template('subversion/create_svn_mirror.sh') } } diff --git a/modules/viewvc/manifests/init.pp b/modules/viewvc/manifests/init.pp index daf7acc4..aa74fcbf 100644 --- a/modules/viewvc/manifests/init.pp +++ b/modules/viewvc/manifests/init.pp @@ -18,7 +18,7 @@ class viewvc { webapp_file => 'viewvc/webapp.conf', } - mga-common::local_script { 'kill_viewvc': + mga_common::local_script { 'kill_viewvc': content => template('viewvc/kill_viewvc.sh'), } |