Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232903
Change subject: Remove/ensure=> absent *_pass scripts
......................................................................
Remove/ensure=> absent *_pass scripts
Those are not used anywhere as far as I know, they seem unmaintained
(webshop pass?) and they are generally a bad way to handout passwords in
general from a security perspective.
Ensure them absent for now, the removal of the class
(misc::deployment::passwordscripts) will happen in a subsequent commit.
Change-Id: I0a206318cd83d8cc7b71f80f7db4cde435ebb940
---
M manifests/misc/deployment.pp
D templates/misc/passwordScripts/cachemgr_pass.erb
D templates/misc/passwordScripts/mysql_root_pass.erb
D templates/misc/passwordScripts/nagios_sql_pass.erb
D templates/misc/passwordScripts/webshop_pass.erb
D templates/misc/passwordScripts/wikiadmin_pass.erb
D templates/misc/passwordScripts/wikiuser2_pass.erb
D templates/misc/passwordScripts/wikiuser_pass.erb
D templates/misc/passwordScripts/wikiuser_pass_nagios.erb
D templates/misc/passwordScripts/wikiuser_pass_real.erb
10 files changed, 3 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/232903/1
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index f56068e..bd48d2f 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -3,63 +3,17 @@
# deployment hosts
class misc::deployment::passwordscripts {
- include passwords::misc::scripts
- $cachemgr_pass = $passwords::misc::scripts::cachemgr_pass
- $mysql_root_pass = $passwords::misc::scripts::mysql_root_pass
- $nagios_sql_pass = $passwords::misc::scripts::nagios_sql_pass
- $webshop_pass = $passwords::misc::scripts::webshop_pass
- $wikiadmin_pass = $passwords::misc::scripts::wikiadmin_pass
- $wikiuser2_pass = $passwords::misc::scripts::wikiuser2_pass
- $wikiuser_pass = $passwords::misc::scripts::wikiuser_pass
- $wikiuser_pass_nagios = $passwords::misc::scripts::wikiuser_pass_nagios
- $wikiuser_pass_real = $passwords::misc::scripts::wikiuser_pass_real
-
- file {
+ file { [
'/usr/local/bin/cachemgr_pass':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content => template('misc/passwordScripts/cachemgr_pass.erb');
'/usr/local/bin/mysql_root_pass':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content => template('misc/passwordScripts/mysql_root_pass.erb');
'/usr/local/bin/nagios_sql_pass':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content => template('misc/passwordScripts/nagios_sql_pass.erb');
'/usr/local/bin/webshop_pass':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content => template('misc/passwordScripts/webshop_pass.erb');
'/usr/local/bin/wikiadmin_pass':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content => template('misc/passwordScripts/wikiadmin_pass.erb');
'/usr/local/bin/wikiuser2_pass':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content => template('misc/passwordScripts/wikiuser2_pass.erb');
'/usr/local/bin/wikiuser_pass':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content => template('misc/passwordScripts/wikiuser_pass.erb');
'/usr/local/bin/wikiuser_pass_nagios':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content =>
template('misc/passwordScripts/wikiuser_pass_nagios.erb');
'/usr/local/bin/wikiuser_pass_real':
- owner => 'root',
- group => 'wikidev',
- mode => '0550',
- content => template('misc/passwordScripts/wikiuser_pass_real.erb');
+ ]:
+ ensure => absent,
}
}
-
diff --git a/templates/misc/passwordScripts/cachemgr_pass.erb
b/templates/misc/passwordScripts/cachemgr_pass.erb
deleted file mode 100644
index 92b53b1..0000000
--- a/templates/misc/passwordScripts/cachemgr_pass.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @cachemgr_pass %>"
diff --git a/templates/misc/passwordScripts/mysql_root_pass.erb
b/templates/misc/passwordScripts/mysql_root_pass.erb
deleted file mode 100644
index a2bba06..0000000
--- a/templates/misc/passwordScripts/mysql_root_pass.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @mysql_root_pass %>"
diff --git a/templates/misc/passwordScripts/nagios_sql_pass.erb
b/templates/misc/passwordScripts/nagios_sql_pass.erb
deleted file mode 100644
index 8030f81..0000000
--- a/templates/misc/passwordScripts/nagios_sql_pass.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @nagios_sql_pass %>"
diff --git a/templates/misc/passwordScripts/webshop_pass.erb
b/templates/misc/passwordScripts/webshop_pass.erb
deleted file mode 100644
index ed74200..0000000
--- a/templates/misc/passwordScripts/webshop_pass.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @webshop_pass %>"
diff --git a/templates/misc/passwordScripts/wikiadmin_pass.erb
b/templates/misc/passwordScripts/wikiadmin_pass.erb
deleted file mode 100644
index a76f0c5..0000000
--- a/templates/misc/passwordScripts/wikiadmin_pass.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @wikiadmin_pass %>"
diff --git a/templates/misc/passwordScripts/wikiuser2_pass.erb
b/templates/misc/passwordScripts/wikiuser2_pass.erb
deleted file mode 100644
index 5d5af5f..0000000
--- a/templates/misc/passwordScripts/wikiuser2_pass.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @wikiuser2_pass %>"
diff --git a/templates/misc/passwordScripts/wikiuser_pass.erb
b/templates/misc/passwordScripts/wikiuser_pass.erb
deleted file mode 100644
index 3559563..0000000
--- a/templates/misc/passwordScripts/wikiuser_pass.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @wikiuser_pass %>"
diff --git a/templates/misc/passwordScripts/wikiuser_pass_nagios.erb
b/templates/misc/passwordScripts/wikiuser_pass_nagios.erb
deleted file mode 100644
index 7772aed..0000000
--- a/templates/misc/passwordScripts/wikiuser_pass_nagios.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @wikiuser_pass_nagios %>"
diff --git a/templates/misc/passwordScripts/wikiuser_pass_real.erb
b/templates/misc/passwordScripts/wikiuser_pass_real.erb
deleted file mode 100644
index 90628d1..0000000
--- a/templates/misc/passwordScripts/wikiuser_pass_real.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-echo -n "<%= @wikiuser_pass_real %>"
--
To view, visit https://gerrit.wikimedia.org/r/232903
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a206318cd83d8cc7b71f80f7db4cde435ebb940
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits