From 1cccc005f02b91e1e0b501f16c1195317977565d Mon Sep 17 00:00:00 2001
From: Marco Malavolti <marco.malavolti@gmail.com>
Date: Sat, 15 Nov 2014 04:39:40 +0100
Subject: [PATCH] Minor fixes for supporting Ubuntu 14.04
---
garr/shib2common/manifests/classes/java/package.pp | 1 +
puppetlabs/stdlib | 1 -
site.pp | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
delete mode 160000 puppetlabs/stdlib
diff --git a/garr/shib2common/manifests/classes/java/package.pp b/garr/shib2common/manifests/classes/java/package.pp
index 02eecce..d83d6cd 100644
--- a/garr/shib2common/manifests/classes/java/package.pp
+++ b/garr/shib2common/manifests/classes/java/package.pp
@@ -50,6 +50,7 @@ class shib2common::java::package {
'oracle-jdk7-installer':
ensure => installed,
+ install_options => '--force-yes',
require => Exec['agree-to-jdk-license'];
}
diff --git a/puppetlabs/stdlib b/puppetlabs/stdlib
deleted file mode 160000
index 0cda858..0000000
--- a/puppetlabs/stdlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0cda8587440f2a9c1d5af174f3fd21ed72fa3ca2
diff --git a/site.pp b/site.pp
index 2288cf5..7ea011c 100644
--- a/site.pp
+++ b/site.pp
@@ -184,7 +184,7 @@ node 'registry.mib.garr.it' {
'communityDesc' => 'GARR Research&Development',
'orgUrl' => 'http://www.garr.it/',
'nameOrg' => 'Consortium GARR',
- 'nameService' => 'Jagger',
+ 'nameService' => 'Jagger',
'url_LogoOrg-32x32' => 'https://registry.mib.garr.it/idp/images/logoEnte-32x32_en.png',
'url_LogoOrg-160x120' => 'https://registry.mib.garr.it/idp/images/logoEnte-160x120_en.png',
},
@@ -194,7 +194,7 @@ node 'registry.mib.garr.it' {
'orgUrl' => 'http://www.garr.it/',
'privacyPage' => 'http://www.garr.it/',
'nameOrg' => 'Consortium GARR',
- 'nameService' => 'Jagger',
+ 'nameService' => 'Jagger',
'url_LogoOrg-32x32' => 'https://registry.mib.garr.it/idp/images/logoEnte-32x32_it.png',
'url_LogoOrg-160x120' => 'https://registry.mib.garr.it/idp/images/logoEnte-160x120_it.png',
},
--
GitLab