aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-07-12 15:28:40 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-07-12 15:28:40 -0300
commit89e7bbc049ec7ccdee31795ca3446513147714e7 (patch)
treefa18d4ab62f7933e14db734bf7a4f5363613cdb0 /manifests
parentfba630f16dc6d23e474ed130b6b43ade7676f620 (diff)
parentd40e1d8d5a91ddb040ee27a990ef7be571761157 (diff)
downloadpuppet-nodo-89e7bbc049ec7ccdee31795ca3446513147714e7.tar.gz
puppet-nodo-89e7bbc049ec7ccdee31795ca3446513147714e7.tar.bz2
Merge branch 'master' into develop
Diffstat (limited to 'manifests')
-rw-r--r--manifests/subsystem/local.pp3
-rw-r--r--manifests/utils/development/gis.pp5
-rw-r--r--manifests/utils/development/virtual.pp2
-rw-r--r--manifests/utils/office.pp2
4 files changed, 9 insertions, 3 deletions
diff --git a/manifests/subsystem/local.pp b/manifests/subsystem/local.pp
index be02bbe..7021646 100644
--- a/manifests/subsystem/local.pp
+++ b/manifests/subsystem/local.pp
@@ -1,6 +1,7 @@
class nodo::subsystem::local {
file { "/etc/rc.local":
- source => "puppet:///modules/nodo/etc/rc.local",
+ source => [ "puppet:///modules/site_nodo/etc/rc.local.${::hostname}",
+ "puppet:///modules/nodo/etc/rc.local" ],
owner => "root",
group => "root",
mode => 0755,
diff --git a/manifests/utils/development/gis.pp b/manifests/utils/development/gis.pp
new file mode 100644
index 0000000..8855166
--- /dev/null
+++ b/manifests/utils/development/gis.pp
@@ -0,0 +1,5 @@
+class nodo::utils::development::gis {
+ package { 'qgis':
+ ensure => present,
+ }
+}
diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp
index 771f342..57b0d6b 100644
--- a/manifests/utils/development/virtual.pp
+++ b/manifests/utils/development/virtual.pp
@@ -6,7 +6,7 @@ class nodo::utils::development::virtual {
}
}
- package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm', 'virtualbox-guest-x11' ]:
+ package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm' ]:
ensure => latest,
}
diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index 49dda20..f9b4350 100644
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -13,7 +13,7 @@ class nodo::utils::office {
}
# LaTeX
- package { [ 'texlive-latex-base', 'texlive-latex-recommended', 'texlive-latex-extra', 'texlive-fonts-extra', 'vim-latexsuite' ]:
+ package { [ 'texlive-latex-base', 'texlive-latex-recommended', 'texlive-latex-extra', 'texlive-fonts-extra', 'vim-latexsuite', 'pdfjam' ]:
ensure => present,
}