Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/304451
Change subject: puppetmaster::puppetdb: add dhparam, fix typo in postgresql ssl.conf ...................................................................... puppetmaster::puppetdb: add dhparam, fix typo in postgresql ssl.conf Change-Id: If3ee69624797017f538908594cb9c8dfce85fc02 --- M modules/postgresql/manifests/server.pp M modules/puppetmaster/manifests/puppetdb.pp 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/51/304451/1 diff --git a/modules/postgresql/manifests/server.pp b/modules/postgresql/manifests/server.pp index 6276e63..4c1239b 100644 --- a/modules/postgresql/manifests/server.pp +++ b/modules/postgresql/manifests/server.pp @@ -77,7 +77,7 @@ if $use_ssl { file { "/etc/postgresql/${pgversion}/main/ssl.conf": ensure => $ensure, - source => 'puppet:///modules/postresql/ssl.conf', + source => 'puppet:///modules/postgresql/ssl.conf', owner => 'root', group => 'root', mode => '0444', diff --git a/modules/puppetmaster/manifests/puppetdb.pp b/modules/puppetmaster/manifests/puppetdb.pp index c6eb8df..2013d30 100644 --- a/modules/puppetmaster/manifests/puppetdb.pp +++ b/modules/puppetmaster/manifests/puppetdb.pp @@ -15,9 +15,11 @@ } $ssl_settings = ssl_ciphersuite('nginx', 'mid') + include ::sslcert::dhparam ::nginx::site { 'puppetdb': ensure => present, content => template('puppetmaster/nginx-puppetdb.conf.erb'), + require => Class['::sslcert::dhparam'] } diamond::collector::nginx{ $::fqdn: -- To view, visit https://gerrit.wikimedia.org/r/304451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3ee69624797017f538908594cb9c8dfce85fc02 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits