[MediaWiki-commits] [Gerrit] translatewiki[master]: [puppet] Add puppet-lint and make pass

Thu, 28 Dec 2017 01:53:46 -0800 

Nikerabbit has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/400564 )

Change subject: [puppet] Add puppet-lint and make pass
......................................................................

[puppet] Add puppet-lint and make pass

make test now passes except for modules/mailman which is the only
remaining vendor module not managed by puppet-librarian.

Change-Id: Ic31db0ab997564bf974221e917de5f1154571932
---
M puppet/Makefile
M puppet/modules/hhvm/files/development.ini
M puppet/modules/hhvm/files/hhvm-development.service
M puppet/modules/hhvm/files/hhvm.service
M puppet/modules/hhvm/files/server.ini
M puppet/modules/nginx/files/error.html
M puppet/modules/nginx/files/logrotate
M puppet/modules/sshd/files/sshd_config
M puppet/modules/wiki/files/irc-log-relay.service
M puppet/modules/wiki/files/irc-rc-relay.service
M puppet/modules/wiki/files/mw-jobrunner.service
M puppet/modules/wiki/files/phplog2irc.service
12 files changed, 17 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/64/400564/1

diff --git a/puppet/Makefile b/puppet/Makefile
index 24d2034..bbc1dff 100644
--- a/puppet/Makefile
+++ b/puppet/Makefile
@@ -1,12 +1,15 @@
 .PHONY: test testpp checkheaders apply
-test: testpp checkheaders
+test: testpp checkheaders lint
 
 checkheaders:
-       for files in modules/*/files; do find $$files -type f |xargs -r grep -L 
'file managed by puppet'; done
+       for files in modules/*/files; do find $$files -type f |xargs -r grep -L 
'managed by puppet'; done
 
 testpp:
        git ls-files | grep "\.pp$$" | xargs -r /opt/puppetlabs/bin/puppet 
parser validate
 
+lint:
+       puppet-lint modules
+
 noop:
        librarian-puppet install --path ./vendor
        sudo /opt/puppetlabs/bin/puppet apply --noop --test --modulepath 
'./modules:./vendor:$$basemodulepath' site.pp
diff --git a/puppet/modules/hhvm/files/development.ini 
b/puppet/modules/hhvm/files/development.ini
index ce1fa9c..3644d07 100644
--- a/puppet/modules/hhvm/files/development.ini
+++ b/puppet/modules/hhvm/files/development.ini
@@ -1,3 +1,4 @@
+; This file is managed by puppet
 ; php options
 
 pid = /run/hhvm-development/hhvm.pid
diff --git a/puppet/modules/hhvm/files/hhvm-development.service 
b/puppet/modules/hhvm/files/hhvm-development.service
index f3d8e12..010bf8b 100644
--- a/puppet/modules/hhvm/files/hhvm-development.service
+++ b/puppet/modules/hhvm/files/hhvm-development.service
@@ -1,3 +1,4 @@
+# This file is managed by puppet
 [Unit]
 Description=HHVM for development site
 
diff --git a/puppet/modules/hhvm/files/hhvm.service 
b/puppet/modules/hhvm/files/hhvm.service
index 743639d..11aae6b 100644
--- a/puppet/modules/hhvm/files/hhvm.service
+++ b/puppet/modules/hhvm/files/hhvm.service
@@ -1,3 +1,4 @@
+# This file is managed by puppet
 [Unit]
 Description=HHVM for production site
 
diff --git a/puppet/modules/hhvm/files/server.ini 
b/puppet/modules/hhvm/files/server.ini
index aaafb33..6a44a5a 100644
--- a/puppet/modules/hhvm/files/server.ini
+++ b/puppet/modules/hhvm/files/server.ini
@@ -1,3 +1,4 @@
+; This file is managed by puppet
 ; php options
 
 pid = /run/hhvm/hhvm.pid
diff --git a/puppet/modules/nginx/files/error.html 
b/puppet/modules/nginx/files/error.html
index 7eb8f0f..4047832 100644
--- a/puppet/modules/nginx/files/error.html
+++ b/puppet/modules/nginx/files/error.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<!-- This file is managed by puppet -->
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -9,4 +10,4 @@
     <p>It looks like our backend is currently unable to process your request. 
Please try again later.</p>
     <img src="https://translatewiki.net/static/logo.png";>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/puppet/modules/nginx/files/logrotate 
b/puppet/modules/nginx/files/logrotate
index cd2a62a..c339342 100644
--- a/puppet/modules/nginx/files/logrotate
+++ b/puppet/modules/nginx/files/logrotate
@@ -1,3 +1,4 @@
+# This file is managed by puppet
 /var/log/nginx/*.log {
        weekly
        missingok
diff --git a/puppet/modules/sshd/files/sshd_config 
b/puppet/modules/sshd/files/sshd_config
index 24e7ed4..da5bb34 100644
--- a/puppet/modules/sshd/files/sshd_config
+++ b/puppet/modules/sshd/files/sshd_config
@@ -1,3 +1,4 @@
+# This file is managed by puppet
 # Package generated configuration file
 # See the sshd_config(5) manpage for details
 
diff --git a/puppet/modules/wiki/files/irc-log-relay.service 
b/puppet/modules/wiki/files/irc-log-relay.service
index 9f628d4..ac314b0 100644
--- a/puppet/modules/wiki/files/irc-log-relay.service
+++ b/puppet/modules/wiki/files/irc-log-relay.service
@@ -1,3 +1,4 @@
+# This file is managed by puppet
 [Unit]
 Description=IRC relay for PHP error log
 After=network.target
diff --git a/puppet/modules/wiki/files/irc-rc-relay.service 
b/puppet/modules/wiki/files/irc-rc-relay.service
index 3748512..a668a8f 100644
--- a/puppet/modules/wiki/files/irc-rc-relay.service
+++ b/puppet/modules/wiki/files/irc-rc-relay.service
@@ -1,3 +1,4 @@
+# This file is managed by puppet
 [Unit]
 Description=IRC relay for MediaWiki recent changes
 After=network.target
diff --git a/puppet/modules/wiki/files/mw-jobrunner.service 
b/puppet/modules/wiki/files/mw-jobrunner.service
index c51a387..0dee9ef 100644
--- a/puppet/modules/wiki/files/mw-jobrunner.service
+++ b/puppet/modules/wiki/files/mw-jobrunner.service
@@ -1,3 +1,4 @@
+# This file is managed by puppet
 [Unit]
 Description=Processes MediaWiki jobs for production site
 After=mysql.service hhvm.service network.target
diff --git a/puppet/modules/wiki/files/phplog2irc.service 
b/puppet/modules/wiki/files/phplog2irc.service
index 5942734..50bad29 100644
--- a/puppet/modules/wiki/files/phplog2irc.service
+++ b/puppet/modules/wiki/files/phplog2irc.service
@@ -1,3 +1,4 @@
+# This file is managed by puppet
 [Unit]
 Description=Processes PHP error log file and relays it to IRC relay
 After=network.target

-- 
To view, visit https://gerrit.wikimedia.org/r/400564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic31db0ab997564bf974221e917de5f1154571932
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to