jenkins-bot has submitted this change and it was merged.
Change subject: Add class documentation
......................................................................
Add class documentation
Satisfies puppet-lint-strict check
Change-Id: I8cde140a4d7e99d9484e2bbe296843646e386599
---
M puppet/modules/base/manifests/es.pp
M puppet/modules/base/manifests/init.pp
M puppet/modules/base/manifests/mediawiki.pp
M puppet/modules/base/manifests/vcs.pp
M puppet/modules/base/manifests/web1.pp
M puppet/modules/eximconf/manifests/es.pp
M puppet/modules/eximconf/manifests/init.pp
M puppet/modules/eximconf/manifests/web1.pp
M puppet/modules/fcgiwrap/manifests/init.pp
M puppet/modules/logrotate/manifests/init.pp
M puppet/modules/mailmanconf/manifests/init.pp
M puppet/modules/mariadb/manifests/init.pp
M puppet/modules/memcached/manifests/init.pp
M puppet/modules/nginx/manifests/init.pp
M puppet/modules/nginx/manifests/sites.pp
M puppet/modules/nginx/manifests/ssl.pp
M puppet/modules/profile/manifests/mwelasticsearch.pp
M puppet/modules/puppet/manifests/init.pp
M puppet/modules/sshd/manifests/init.pp
M puppet/modules/sudo/manifests/init.pp
M puppet/modules/users/manifests/init.pp
21 files changed, 88 insertions(+), 3 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/base/manifests/es.pp
b/puppet/modules/base/manifests/es.pp
index aabc40d..22abe64 100644
--- a/puppet/modules/base/manifests/es.pp
+++ b/puppet/modules/base/manifests/es.pp
@@ -1,3 +1,7 @@
+# = Class: base::es
+#
+# Provides base configuration for server es.
+#
class base::es {
file { '/etc/network/interfaces':
source => 'puppet:///modules/base/interfaces-es'
diff --git a/puppet/modules/base/manifests/init.pp
b/puppet/modules/base/manifests/init.pp
index fc91ba0..22045b8 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: base
+#
+# Provides base configuration for servers.
+#
class base {
package { [
# Basic packages
diff --git a/puppet/modules/base/manifests/mediawiki.pp
b/puppet/modules/base/manifests/mediawiki.pp
index bf4e97e..7b5b11d 100644
--- a/puppet/modules/base/manifests/mediawiki.pp
+++ b/puppet/modules/base/manifests/mediawiki.pp
@@ -1,3 +1,7 @@
+# = Class: base::mediawiki
+#
+# Provides base configuration for MediaWiki.
+#
class base::mediawiki {
package { [
'doxygen',
diff --git a/puppet/modules/base/manifests/vcs.pp
b/puppet/modules/base/manifests/vcs.pp
index a7159f0..3606c3b 100644
--- a/puppet/modules/base/manifests/vcs.pp
+++ b/puppet/modules/base/manifests/vcs.pp
@@ -1,3 +1,8 @@
+# = Class: base
+#
+# Provides installation and configuration for translatewiki.net supported
+# version control systems.
+#
class base::vcs {
package { [
'bzr',
diff --git a/puppet/modules/base/manifests/web1.pp
b/puppet/modules/base/manifests/web1.pp
index 622a93d..af28136 100644
--- a/puppet/modules/base/manifests/web1.pp
+++ b/puppet/modules/base/manifests/web1.pp
@@ -1,3 +1,7 @@
+# = Class: base::web1
+#
+# Provides base configuration for server web1.
+#
class base::web1 {
file { '/etc/hostname':
content => 'translatewiki.net',
diff --git a/puppet/modules/eximconf/manifests/es.pp
b/puppet/modules/eximconf/manifests/es.pp
index 26521e3..30613c7 100644
--- a/puppet/modules/eximconf/manifests/es.pp
+++ b/puppet/modules/eximconf/manifests/es.pp
@@ -1,3 +1,7 @@
+# = Class: eximconf::es
+#
+# Provides exim configuration for server es.
+#
class eximconf::es {
class { 'exim':
source => 'puppet:///modules/eximconf/exim4.conf-es'
diff --git a/puppet/modules/eximconf/manifests/init.pp
b/puppet/modules/eximconf/manifests/init.pp
index 8c3a7fe..40ae97a 100644
--- a/puppet/modules/eximconf/manifests/init.pp
+++ b/puppet/modules/eximconf/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: eximconf
+#
+# Provides basic exim configuration for all servers.
+#
class eximconf {
file { '/etc/mailname':
content => 'translatewiki.net'
diff --git a/puppet/modules/eximconf/manifests/web1.pp
b/puppet/modules/eximconf/manifests/web1.pp
index 4646438..73d9418 100644
--- a/puppet/modules/eximconf/manifests/web1.pp
+++ b/puppet/modules/eximconf/manifests/web1.pp
@@ -1,3 +1,7 @@
+# = Class: eximconf::web1
+#
+# Provides exim configuration for server web1.
+#
class eximconf::web1 {
class { 'exim':
source => 'puppet:///modules/eximconf/exim4.conf-web1'
diff --git a/puppet/modules/fcgiwrap/manifests/init.pp
b/puppet/modules/fcgiwrap/manifests/init.pp
index c9a1c3b..e5e22e1 100644
--- a/puppet/modules/fcgiwrap/manifests/init.pp
+++ b/puppet/modules/fcgiwrap/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: fcgiwrap
+#
+# Provides installation and configuration for the fcgiwrap package.
+#
class fcgiwrap {
package { 'fcgiwrap':
ensure => present,
diff --git a/puppet/modules/logrotate/manifests/init.pp
b/puppet/modules/logrotate/manifests/init.pp
index 2cd019b..4c71ba9 100644
--- a/puppet/modules/logrotate/manifests/init.pp
+++ b/puppet/modules/logrotate/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: logrotate
+#
+# Provides logrotate configuration.
+#
class logrotate {
file { '/etc/logrotate.d/twn':
source => 'puppet:///modules/logrotate/twn'
diff --git a/puppet/modules/mailmanconf/manifests/init.pp
b/puppet/modules/mailmanconf/manifests/init.pp
index 00b8c4a..c94f622 100644
--- a/puppet/modules/mailmanconf/manifests/init.pp
+++ b/puppet/modules/mailmanconf/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: mailmanconf
+#
+# Provides mailman configuration.
+#
class mailmanconf {
# Would prefer to just use "list" but the module does not support this, so
# make an alias
diff --git a/puppet/modules/mariadb/manifests/init.pp
b/puppet/modules/mariadb/manifests/init.pp
index 5908582..d9ad824 100644
--- a/puppet/modules/mariadb/manifests/init.pp
+++ b/puppet/modules/mariadb/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: mariadb
+#
+# Provides mariadb installation and configuration for translatewiki.net.
+#
class mariadb {
class { '::mysql::server':
package_name => 'mariadb-server',
@@ -7,7 +11,7 @@
character-set-server => 'utf8',
innodb_additional_mem_pool_size => '400M',
innodb_buffer_pool_size => '12G',
- innodb_file_per_table => 'true',
+ innodb_file_per_table => true,
innodb_log_file_size => '500M',
key_buffer_size => '64M',
log_slow_queries => '/var/log/mysql/mysql-slow.log',
diff --git a/puppet/modules/memcached/manifests/init.pp
b/puppet/modules/memcached/manifests/init.pp
index 50961ea..794e05f 100644
--- a/puppet/modules/memcached/manifests/init.pp
+++ b/puppet/modules/memcached/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: memcached
+#
+# Provides memcached installation and configuration.
+#
class memcached {
package { 'memcached':
ensure => present,
diff --git a/puppet/modules/nginx/manifests/init.pp
b/puppet/modules/nginx/manifests/init.pp
index e59306a..69dabf4 100644
--- a/puppet/modules/nginx/manifests/init.pp
+++ b/puppet/modules/nginx/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: nginx
+#
+# Provides installation and configuration information for the nginx package.
+#
class nginx {
include apt
apt::ppa { 'ppa:nginx/stable': }
diff --git a/puppet/modules/nginx/manifests/sites.pp
b/puppet/modules/nginx/manifests/sites.pp
index cefbb15..6def7d5 100644
--- a/puppet/modules/nginx/manifests/sites.pp
+++ b/puppet/modules/nginx/manifests/sites.pp
@@ -1,3 +1,7 @@
+# = Class: nginx::sites
+#
+# Provides configuration information for nginx sites.
+#
class nginx::sites {
include nginx::ssl
diff --git a/puppet/modules/nginx/manifests/ssl.pp
b/puppet/modules/nginx/manifests/ssl.pp
index b661c93..eebbeab 100644
--- a/puppet/modules/nginx/manifests/ssl.pp
+++ b/puppet/modules/nginx/manifests/ssl.pp
@@ -1,3 +1,7 @@
+# = Class: nginx::ssl
+#
+# Provides SSL configuration for nginx sites.
+#
class nginx::ssl {
include nginx
diff --git a/puppet/modules/profile/manifests/mwelasticsearch.pp
b/puppet/modules/profile/manifests/mwelasticsearch.pp
index c73b683..9b8d32c 100644
--- a/puppet/modules/profile/manifests/mwelasticsearch.pp
+++ b/puppet/modules/profile/manifests/mwelasticsearch.pp
@@ -1,3 +1,7 @@
+# = Class: mwelasticsearch
+#
+# Provides elasticsearch configuration for MediaWiki.
+#
class profile::mwelasticsearch {
include ::nginx
@@ -14,7 +18,7 @@
}
elasticsearch::instance { 'es-01':
- config => {
+ config => {
'network.host' => '::1',
'script.disable_dynamic' => false,
},
diff --git a/puppet/modules/puppet/manifests/init.pp
b/puppet/modules/puppet/manifests/init.pp
index 61fdba6..07e85cc 100644
--- a/puppet/modules/puppet/manifests/init.pp
+++ b/puppet/modules/puppet/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: pupet
+#
+# Provides puppet installation and configuration for servers.
+#
class puppet {
package { 'puppet':
ensure => present,
@@ -6,6 +10,6 @@
# We are applying manually via CLI
service { 'puppet':
ensure => stopped,
- enable => false,
+ enable => false
}
}
diff --git a/puppet/modules/sshd/manifests/init.pp
b/puppet/modules/sshd/manifests/init.pp
index 915c6c9..b3c901a 100644
--- a/puppet/modules/sshd/manifests/init.pp
+++ b/puppet/modules/sshd/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: ssh
+#
+# Provides sshd configuration for servers.
+#
class sshd {
file { '/etc/ssh/sshd_config':
source => 'puppet:///modules/sshd/sshd_config',
diff --git a/puppet/modules/sudo/manifests/init.pp
b/puppet/modules/sudo/manifests/init.pp
index f9e4932..608da21 100644
--- a/puppet/modules/sudo/manifests/init.pp
+++ b/puppet/modules/sudo/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: sudo
+#
+# Provides sudoers file.
+#
class sudo {
package { 'sudo':
ensure => present,
diff --git a/puppet/modules/users/manifests/init.pp
b/puppet/modules/users/manifests/init.pp
index dd7c750..970de1c 100644
--- a/puppet/modules/users/manifests/init.pp
+++ b/puppet/modules/users/manifests/init.pp
@@ -1,3 +1,7 @@
+# = Class: users
+#
+# Provides user configuration for servers.
+#
class users {
# Pull down the main aliases file
file { '/etc/aliases':
--
To view, visit https://gerrit.wikimedia.org/r/246664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8cde140a4d7e99d9484e2bbe296843646e386599
Gerrit-PatchSet: 5
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
