Bearloga has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368200 )
Change subject: r & shiny_server: Fix duplicate xml2 declaration
......................................................................
r & shiny_server: Fix duplicate xml2 declaration
Duplicate declaration: R::Cran[xml2] is already declared in file
/etc/puppet/modules/r/manifests/init.pp; cannot redeclare at
/etc/puppet/modules/shiny_server/manifests/init.pp
Change-Id: I7d8fec6389b43d3867ea5453a0b94b2828ef741b
---
M modules/r/manifests/init.pp
M modules/shiny_server/manifests/init.pp
2 files changed, 10 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/368200/1
diff --git a/modules/r/manifests/init.pp b/modules/r/manifests/init.pp
index 5711ff9..df2364f 100644
--- a/modules/r/manifests/init.pp
+++ b/modules/r/manifests/init.pp
@@ -36,12 +36,16 @@
owner => 'root',
group => 'root',
mode => '0644',
- source => 'puppet:///modules/r/update-library.R'
+ source => 'puppet:///modules/r/update-library.R',
}
if $devtools {
$devtools_essentials = [
- 'libssl-dev', 'libcurl4-openssl-dev', 'libicu-dev', 'libssh2-1-dev'
+ 'git-core',
+ 'libssl-dev',
+ 'libcurl4-openssl-dev',
+ 'libicu-dev',
+ 'libssh2-1-dev'
]
require_package($devtools_essentials)
@@ -51,11 +55,13 @@
$r_packages = [
'xml2',
+ 'curl',
'testthat',
'devtools'
]
r::cran { $r_packages:
require => [
+ Package['git-core'],
Package['libxml2'],
Package['libxml2-dev'],
R::Cran['openssl'],
diff --git a/modules/shiny_server/manifests/init.pp
b/modules/shiny_server/manifests/init.pp
index 058d73c..f6bf745 100644
--- a/modules/shiny_server/manifests/init.pp
+++ b/modules/shiny_server/manifests/init.pp
@@ -26,27 +26,12 @@
$essentials = [
'gfortran', 'g++-4.8', 'gfortran-4.8',
'libssl-dev', 'libcurl4-openssl-dev', 'libxml2-dev', 'libssh2-1-dev',
- 'libcairo2-dev', 'git-core', 'gdebi', 'pandoc'
+ 'libcairo2-dev', 'gdebi', 'pandoc'
]
require_package($essentials)
# Install R packages from CRAN, Gerrit, and GitHub:
$cran_mirror = 'https://cran.cnr.berkeley.edu'
- r::cran { 'curl':
- require => Package['libcurl4-openssl-dev'],
- mirror => $cran_mirror,
- }
- r::cran { 'xml2':
- require => Package['libxml2-dev'],
- mirror => $cran_mirror,
- }
- r::cran { 'devtools':
- require => [
- Package['git-core'],
- R::Cran['curl']
- ],
- mirror => $cran_mirror,
- }
r::cran { 'rmarkdown':
require => Package['pandoc'],
mirror => $cran_mirror,
@@ -56,7 +41,7 @@
# It's a lot of packages so we *really* need to extend the timeout.
r::cran { 'tidyverse':
timeout => 6000,
- mirror => $cran_mirror
+ mirror => $cran_mirror,
}
$cran_packages = [
# Shiny Dashboarding
--
To view, visit https://gerrit.wikimedia.org/r/368200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d8fec6389b43d3867ea5453a0b94b2828ef741b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Bearloga <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
