diff options
author | Michael Scherer <misc@mageia.org> | 2012-01-08 17:39:08 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-01-08 17:39:08 +0000 |
commit | 761db207f6fecb2f8117919055c72e058ceb8f6f (patch) | |
tree | efda221239f871fa06c641b0d0d4829c0e6b75d7 /modules/buildsystem/manifests | |
parent | 3e6f60ba018b26a1665a4f8077ab439dc6199503 (diff) | |
download | puppet-761db207f6fecb2f8117919055c72e058ceb8f6f.tar puppet-761db207f6fecb2f8117919055c72e058ceb8f6f.tar.gz puppet-761db207f6fecb2f8117919055c72e058ceb8f6f.tar.bz2 puppet-761db207f6fecb2f8117919055c72e058ceb8f6f.tar.xz puppet-761db207f6fecb2f8117919055c72e058ceb8f6f.zip |
split binrepos in its own file
Diffstat (limited to 'modules/buildsystem/manifests')
-rw-r--r-- | modules/buildsystem/manifests/binrepos.pp | 41 | ||||
-rw-r--r-- | modules/buildsystem/manifests/init.pp | 38 |
2 files changed, 41 insertions, 38 deletions
diff --git a/modules/buildsystem/manifests/binrepos.pp b/modules/buildsystem/manifests/binrepos.pp new file mode 100644 index 00000000..eed01d6a --- /dev/null +++ b/modules/buildsystem/manifests/binrepos.pp @@ -0,0 +1,41 @@ +class buildsystem { + class binrepo inherits base { + include sudo + $binrepo_login = "binrepo" + $binrepo_homedir = "/var/lib/$binrepo_login" + $binrepodir = "$binrepo_homedir/data" + $uploadinfosdir = "$binrepo_homedir/infos" + $uploadbinpath = '/usr/local/bin/upload-bin' + $uploadmail_from = "root@$domain" + $uploadmail_to = "packages-commits@ml.$domain" + + $packagers_committers_group = $buildsystem::base::packagers_committers_group + + user {"$binrepo_login": + ensure => present, + comment => "Binary files repository", + managehome => true, + shell => "/bin/bash", + home => "$binrepo_homedir", + } + + file { [$binrepodir, $uploadinfosdir]: + ensure => directory, + owner => $binrepo_login, + } + + local_script { + "upload-bin": content => template('buildsystem/binrepo/upload-bin'); + "wrapper.upload-bin": content => template('buildsystem/binrepo/wrapper.upload-bin'); + } + + sudo::sudoers_config { "binrepo": + content => template("buildsystem/binrepo/sudoers.binrepo") + } + + apache::vhost_base { "binrepo.$domain": + location => $binrepodir, + content => template("buildsystem/binrepo/vhost_binrepo.conf"), + } + } +} diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index ba042d35..cafa22f8 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -101,44 +101,6 @@ class buildsystem { } } - class binrepo inherits base { - include sudo - $binrepo_login = "binrepo" - $binrepo_homedir = "/var/lib/$binrepo_login" - $binrepodir = "$binrepo_homedir/data" - $uploadinfosdir = "$binrepo_homedir/infos" - $uploadbinpath = '/usr/local/bin/upload-bin' - $uploadmail_from = "root@$domain" - $uploadmail_to = "packages-commits@ml.$domain" - - user {"$binrepo_login": - ensure => present, - comment => "Binary files repository", - managehome => true, - shell => "/bin/bash", - home => "$binrepo_homedir", - } - - file { [$binrepodir, $uploadinfosdir]: - ensure => directory, - owner => $binrepo_login, - } - - local_script { - "upload-bin": content => template('buildsystem/upload-bin'); - "wrapper.upload-bin": content => template('buildsystem/wrapper.upload-bin'); - } - - sudo::sudoers_config { "binrepo": - content => template("buildsystem/sudoers.binrepo") - } - - apache::vhost_base { "binrepo.$domain": - location => $binrepodir, - content => template("buildsystem/vhost_binrepo.conf"), - } - } - class youri_submit { include sudo |