aboutsummaryrefslogtreecommitdiff
path: root/manifests/utils/development
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-09-23 16:29:26 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-09-23 16:29:26 -0300
commit4a880ad141c8deefb41549e5e79c868303e1c296 (patch)
tree259be8415b54beb82bcafa6fed2114de49a627b4 /manifests/utils/development
parent50d24f812a1ea34e190632cfef4b217490d7522d (diff)
downloadpuppet-nodo-4a880ad141c8deefb41549e5e79c868303e1c296.tar.gz
puppet-nodo-4a880ad141c8deefb41549e5e79c868303e1c296.tar.bz2
Coding style for utilities
Diffstat (limited to 'manifests/utils/development')
-rw-r--r--manifests/utils/development/debian.pp34
-rw-r--r--manifests/utils/development/gis.pp4
-rw-r--r--manifests/utils/development/git.pp21
-rw-r--r--manifests/utils/development/ide.pp36
-rw-r--r--manifests/utils/development/mediawiki.pp4
-rw-r--r--manifests/utils/development/puppet.pp8
-rw-r--r--manifests/utils/development/python.pp8
-rw-r--r--manifests/utils/development/reverse.pp4
-rw-r--r--manifests/utils/development/system.pp12
-rw-r--r--manifests/utils/development/toolchain.pp11
-rw-r--r--manifests/utils/development/toolchain/arm.pp12
-rw-r--r--manifests/utils/development/vcs.pp6
-rw-r--r--manifests/utils/development/virtual.pp22
-rw-r--r--manifests/utils/development/web.pp5
14 files changed, 140 insertions, 47 deletions
diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp
index 7b0e97f..ef2cba2 100644
--- a/manifests/utils/development/debian.pp
+++ b/manifests/utils/development/debian.pp
@@ -1,9 +1,33 @@
class nodo::utils::development::debian {
- package { [ 'debhelper', 'python-stdeb', 'fakeroot', 'dupload', 'autotools-dev', 'dh-make',
- 'reportbug', 'debian-keyring', 'devscripts', 'pbuilder', 'build-essential', 'dh-buildinfo',
- 'quilt', 'dpatch', 'dput', 'debian-goodies', 'gem2deb', 'git-buildpackage',
- 'cdbs', 'dh-autoreconf', 'apt-rdepends', 'po4a', 'vmdebootstrap', 'apt-show-versions',
- 'apt-show-source', 'apt-listchanges', 'apt-forktracer' ]:
+ package { [
+ 'debhelper',
+ 'python-stdeb',
+ 'fakeroot',
+ 'dupload',
+ 'autotools-dev',
+ 'dh-make',
+ 'reportbug',
+ 'debian-keyring',
+ 'devscripts',
+ 'pbuilder',
+ 'build-essential',
+ 'dh-buildinfo',
+ 'quilt',
+ 'dpatch',
+ 'dput',
+ 'debian-goodies',
+ 'gem2deb',
+ 'git-buildpackage',
+ 'cdbs',
+ 'dh-autoreconf',
+ 'apt-rdepends',
+ 'po4a',
+ 'vmdebootstrap',
+ 'apt-show-versions',
+ 'apt-show-source',
+ 'apt-listchanges',
+ 'apt-forktracer',
+ ]:
ensure => installed,
}
}
diff --git a/manifests/utils/development/gis.pp b/manifests/utils/development/gis.pp
index 8855166..1a3c412 100644
--- a/manifests/utils/development/gis.pp
+++ b/manifests/utils/development/gis.pp
@@ -1,5 +1,7 @@
class nodo::utils::development::gis {
- package { 'qgis':
+ package { [
+ 'qgis'
+ ]:
ensure => present,
}
}
diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp
index b5fc5aa..7052d96 100644
--- a/manifests/utils/development/git.pp
+++ b/manifests/utils/development/git.pp
@@ -1,11 +1,22 @@
class nodo::utils::development::git {
- package { [ 'gitk', 'git-gui', 'tig', 'git-cola', 'legit',
- 'git-extras', 'git-flow', 'topgit', 'git-remote-gcrypt', ]:
+ package { [
+ 'gitk',
+ 'git-gui',
+ 'tig',
+ 'git-cola',
+ 'legit',
+ 'git-extras',
+ 'git-flow',
+ 'topgit',
+ 'git-remote-gcrypt',
+ ]:
ensure => installed,
}
# Newer packages
- package { 'git-crypt':
+ package { [
+ 'git-crypt',
+ ]:
ensure => $::lsbdistcodename ? {
'stretch' => present,
'sid' => present,
@@ -14,7 +25,9 @@ class nodo::utils::development::git {
}
# Wheezy only
- package { 'git-stuff':
+ package { [
+ 'git-stuff',
+ ]:
ensure => $::lsbdistcodename ? {
'wheezy' => present,
default => absent,
diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index c1cdc52..9928da5 100644
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -1,29 +1,29 @@
class nodo::utils::development::ide {
# In use
package { [
- 'mr',
- 'hexedit',
- 'ack-grep',
- 'markdown',
- 'python-sphinx',
- 'pelican',
- ]:
+ 'mr',
+ 'hexedit',
+ 'ack-grep',
+ 'markdown',
+ 'python-sphinx',
+ 'pelican',
+ ]:
ensure => installed,
}
# Not in use
package { [
- 'ttyrec',
- 'bugs-everywhere',
- 'silversearcher-ag',
- 'ticgit',
- 'ticgitweb',
- 'ditz',
- 'pnopaste-cli',
- 'exuberant-ctags',
- 'doxygen',
- 'agave',
- ]:
+ 'ttyrec',
+ 'bugs-everywhere',
+ 'silversearcher-ag',
+ 'ticgit',
+ 'ticgitweb',
+ 'ditz',
+ 'pnopaste-cli',
+ 'exuberant-ctags',
+ 'doxygen',
+ 'agave',
+ ]:
ensure => absent,
}
}
diff --git a/manifests/utils/development/mediawiki.pp b/manifests/utils/development/mediawiki.pp
index 5ba5b55..a92b8d5 100644
--- a/manifests/utils/development/mediawiki.pp
+++ b/manifests/utils/development/mediawiki.pp
@@ -1,5 +1,7 @@
class nodo::utils::development::mediawiki {
- package { 'git-mediawiki':
+ package { [
+ 'git-mediawiki',
+ ]:
ensure => $::lsbdistcodename ? {
'wheezy' => absent,
default => present,
diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
index bf26dbb..0d823a7 100644
--- a/manifests/utils/development/puppet.pp
+++ b/manifests/utils/development/puppet.pp
@@ -1,9 +1,13 @@
class nodo::utils::development::puppet {
- package { 'puppet-lint':
+ package { [
+ 'puppet-lint',
+ ]:
ensure => installed,
}
- package { 'ruby-hiera-puppet':
+ package { [
+ 'ruby-hiera-puppet',
+ ]:
ensure => $::lsbdistcodename ? {
'wheezy' => present,
default => absent,
diff --git a/manifests/utils/development/python.pp b/manifests/utils/development/python.pp
index 6e38525..036c0ce 100644
--- a/manifests/utils/development/python.pp
+++ b/manifests/utils/development/python.pp
@@ -1,5 +1,11 @@
class nodo::utils::development::python {
- package { [ 'python-setuptools', 'python-virtualenv', 'python-yaml', 'python-cheetah', 'python-unidecode' ]:
+ package { [
+ 'python-setuptools',
+ 'python-virtualenv',
+ 'python-yaml',
+ 'python-cheetah',
+ 'python-unidecode',
+ ]:
ensure => installed,
}
}
diff --git a/manifests/utils/development/reverse.pp b/manifests/utils/development/reverse.pp
index 1770b34..72cf480 100644
--- a/manifests/utils/development/reverse.pp
+++ b/manifests/utils/development/reverse.pp
@@ -1,5 +1,7 @@
class nodo::utils::development::reverse {
- package { 'binwalk':
+ package { [
+ 'binwalk',
+ ]:
ensure => present,
}
}
diff --git a/manifests/utils/development/system.pp b/manifests/utils/development/system.pp
index e654e38..9e48a31 100644
--- a/manifests/utils/development/system.pp
+++ b/manifests/utils/development/system.pp
@@ -1,9 +1,17 @@
class nodo::utils::development::system {
- package { [ 'debirf', 'xorriso', 'kpartx', 'openocd', 'live-build' ]:
+ package { [
+ 'debirf',
+ 'xorriso',
+ 'kpartx',
+ 'openocd',
+ 'live-build',
+ ]:
ensure => installed,
}
- package { 'unetbootin':
+ package { [
+ 'unetbootin',
+ ]:
ensure => $::lsbdistcodename ? {
'wheezy' => present,
default => absent,
diff --git a/manifests/utils/development/toolchain.pp b/manifests/utils/development/toolchain.pp
index 9abc130..ca39299 100644
--- a/manifests/utils/development/toolchain.pp
+++ b/manifests/utils/development/toolchain.pp
@@ -1,6 +1,13 @@
class nodo::utils::development::toolchain {
- package { [ 'emdebian-archive-keyring', 'xapt', 'pdebuild-cross', 'scratchbox2',
- 'qemu-user-static', 'multistrap', 'fakechroot' ]:
+ package { [
+ 'emdebian-archive-keyring',
+ 'xapt',
+ 'pdebuild-cross',
+ 'scratchbox2',
+ 'qemu-user-static',
+ 'multistrap',
+ 'fakechroot',
+ ]:
ensure => installed,
}
}
diff --git a/manifests/utils/development/toolchain/arm.pp b/manifests/utils/development/toolchain/arm.pp
index 911f5cb..6f4334c 100644
--- a/manifests/utils/development/toolchain/arm.pp
+++ b/manifests/utils/development/toolchain/arm.pp
@@ -15,9 +15,15 @@ class nodo::utils::development::toolchain::arm(
# },
#}
- package { [ 'linux-libc-dev-armel-cross', 'libc6-armel-cross', 'libc6-dev-armel-cross',
- 'binutils-arm-linux-gnueabi', 'gcc-4.4-arm-linux-gnueabi', 'g++-4.4-arm-linux-gnueabi',
- 'gdb-arm-linux-gnueabi' ]:
+ package { [
+ 'linux-libc-dev-armel-cross',
+ 'libc6-armel-cross',
+ 'libc6-dev-armel-cross',
+ 'binutils-arm-linux-gnueabi',
+ 'gcc-4.4-arm-linux-gnueabi',
+ 'g++-4.4-arm-linux-gnueabi',
+ 'gdb-arm-linux-gnueabi',
+ ]:
ensure => $ensure,
require => Apt::Sources_list['emdebian.list'],
}
diff --git a/manifests/utils/development/vcs.pp b/manifests/utils/development/vcs.pp
index 2787d98..ce24148 100644
--- a/manifests/utils/development/vcs.pp
+++ b/manifests/utils/development/vcs.pp
@@ -1,5 +1,9 @@
class nodo::utils::development::vcs {
- package { [ 'subversion', 'mercurial', 'bzr']:
+ package { [
+ 'subversion',
+ 'mercurial',
+ 'bzr',
+ ]:
ensure => installed,
}
}
diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp
index 2258554..dcdc9d4 100644
--- a/manifests/utils/development/virtual.pp
+++ b/manifests/utils/development/virtual.pp
@@ -1,28 +1,40 @@
class nodo::utils::development::virtual {
- package { 'vagrant':
+ package { [
+ 'vagrant',
+ ]:
ensure => $::lsbdistcodename ? {
'squeeze' => absent,
default => latest,
}
}
- package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm' ]:
+ package { [
+ 'virtualbox-guest-additions-iso',
+ 'qemu',
+ 'qemu-kvm',
+ ]:
ensure => latest,
}
# TODO: wait for jessie release
- #package { 'docker.io':
+ #package { [
+ # 'docker.io',
+ #]:
# ensure => installed,
#}
# TODO: wait for stretch release
- #package { 'packer':
+ #package { [
+ # 'packer',
+ #]:
# ensure => installed,
#}
# TODO: We're not managing this package as we're favouring the
# wheezy-backports virtualbox which doesn't needs it.
- #package { 'virtualbox-fuse':
+ #package { [
+ # 'virtualbox-fuse',
+ #]:
# ensure => present,
#}
}
diff --git a/manifests/utils/development/web.pp b/manifests/utils/development/web.pp
index 1a7effe..911c634 100644
--- a/manifests/utils/development/web.pp
+++ b/manifests/utils/development/web.pp
@@ -1,5 +1,8 @@
class nodo::utils::development::web {
- package { [ 'apache2-utils', 'yui-compressor' ]:
+ package { [
+ 'apache2-utils',
+ 'yui-compressor',
+ ]:
ensure => installed,
}
}