diff options
| author | varac <varacanero@zeromail.org> | 2017-04-19 01:44:31 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-04-19 01:44:31 +0200 |
| commit | d4171c00773e1ca8b05cf9c1be23d1227d9bd9af (patch) | |
| tree | bf18b67e9158437355900fb6fa2ef42312848caa /files/puppet/modules/pixelated/manifests | |
| parent | d46074423179768632f8f786281c4870b6fb4e0e (diff) | |
git subrepo pull files/puppet/modules/pixelated
subrepo:
subdir: "files/puppet/modules/pixelated"
merged: "6dc72f4"
upstream:
origin: "https://github.com/pixelated/puppet-pixelated.git"
branch: "master"
commit: "6dc72f4"
git-subrepo:
version: "0.3.1"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "3202adb"
Diffstat (limited to 'files/puppet/modules/pixelated/manifests')
| -rw-r--r-- | files/puppet/modules/pixelated/manifests/apt.pp | 8 | ||||
| -rw-r--r-- | files/puppet/modules/pixelated/manifests/apt/install_packages_from_pixelated.pp | 20 |
2 files changed, 27 insertions, 1 deletions
diff --git a/files/puppet/modules/pixelated/manifests/apt.pp b/files/puppet/modules/pixelated/manifests/apt.pp index 76f4697..c6280f5 100644 --- a/files/puppet/modules/pixelated/manifests/apt.pp +++ b/files/puppet/modules/pixelated/manifests/apt.pp @@ -3,9 +3,13 @@ class pixelated::apt { include apt + # Use latest packages from i.e. jessie-snapshots (possibly unstable) for + # special domains + $version = $::domain ? { /^(staging|dev|unstable)\.pixelated-project\.org$/ => '-snapshots', - default => '', + /^pixelated-project.local$/ => '-snapshots', + default => '', } apt::sources_list { 'pixelated.list': @@ -23,4 +27,6 @@ class pixelated::apt { refreshonly => true, require => File['/srv/leap/0x287A1542472DC0E3_packages@pixelated-project.org.asc'], } + + include ::pixelated::apt::install_packages_from_pixelated } diff --git a/files/puppet/modules/pixelated/manifests/apt/install_packages_from_pixelated.pp b/files/puppet/modules/pixelated/manifests/apt/install_packages_from_pixelated.pp new file mode 100644 index 0000000..a9d43af --- /dev/null +++ b/files/puppet/modules/pixelated/manifests/apt/install_packages_from_pixelated.pp @@ -0,0 +1,20 @@ +# Prefer all installed packages from the pixelayed repo +class pixelated::apt::install_packages_from_pixelated { + + file { '/usr/local/bin/prefer_package_repo.sh': + source => 'puppet:///modules/pixelated/prefer_package_repo.sh', + owner => 'root', + group => 'root', + mode => '0755', + } + + exec { 'prefer_pixelated_packages': + command => '/usr/local/bin/prefer_package_repo.sh', + unless => '/usr/local/bin/prefer_package_repo.sh check', + require => [ + Package[ 'leap-keymanager', 'leap-mx', 'soledad-client', 'soledad-server' ], + File['/usr/local/bin/prefer_package_repo.sh'] + ] + } + +} |