From e80a145b2c2bf6be4ce7cb15199af50f2873b368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Thu, 12 Jul 2018 13:35:57 +0300
Subject: [PATCH] Remove passwd from bundled configurations

The configurations still used the old parameter name.
---
 docker/maxscale.cnf.d/example.cnf         |  6 +++---
 server/maxscale.cnf.template              |  6 +++---
 server/maxscale_binlogserver_template.cnf |  4 ++--
 test/maxscale_test.cnf                    | 10 +++++-----
 test/maxscale_test_secondary.cnf          | 10 +++++-----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docker/maxscale.cnf.d/example.cnf b/docker/maxscale.cnf.d/example.cnf
index 28b629cce..d7b8cc663 100644
--- a/docker/maxscale.cnf.d/example.cnf
+++ b/docker/maxscale.cnf.d/example.cnf
@@ -30,7 +30,7 @@ type=monitor
 module=mariadbmon
 servers=server1,server2,server3
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 monitor_interval=2000
 
 # Service definitions
@@ -44,7 +44,7 @@ type=service
 router=readconnroute
 servers=server1,server2,server3
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 router_options=slave
 
 # ReadWriteSplit documentation:
@@ -55,7 +55,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 
 # Listener definitions for the services
 # Listeners represent the ports the services will listen on.
diff --git a/server/maxscale.cnf.template b/server/maxscale.cnf.template
index 09af2fc2e..ae864abe4 100644
--- a/server/maxscale.cnf.template
+++ b/server/maxscale.cnf.template
@@ -32,7 +32,7 @@ type=monitor
 module=mariadbmon
 servers=server1
 user=myuser
-passwd=mypwd
+password=mypwd
 monitor_interval=2000
 
 # Service definitions
@@ -49,7 +49,7 @@ type=service
 router=readconnroute
 servers=server1
 user=myuser
-passwd=mypwd
+password=mypwd
 router_options=slave
 
 # ReadWriteSplit documentation:
@@ -60,7 +60,7 @@ type=service
 router=readwritesplit
 servers=server1
 user=myuser
-passwd=mypwd
+password=mypwd
 
 # This service enables the use of the MaxAdmin interface
 # MaxScale administration guide:
diff --git a/server/maxscale_binlogserver_template.cnf b/server/maxscale_binlogserver_template.cnf
index 88b1efe30..9afa8b747 100644
--- a/server/maxscale_binlogserver_template.cnf
+++ b/server/maxscale_binlogserver_template.cnf
@@ -27,7 +27,7 @@ threads=6
 #       router=<name of router module>
 #       servers=<server name>,<server name>,...
 #       user=<User to fetch password inforamtion with>
-#       passwd=<Password of the user, plain text currently>
+#       password=<Password of the user, plain text currently>
 #       version_string=<specific string for server handshake,
 #               default is the MariaDB embedded library version>
 #       router_options=<option[=value]>,<option[=value]>,...
@@ -57,7 +57,7 @@ servers=master
 #       SELECT ON mysql.db
 #       SHOW DATABASES ON *.*
 user=repl
-passwd=slavepass
+password=slavepass
 version_string=5.6.15-log
 
 # The router_options set parameters to the binlogrouter:
diff --git a/test/maxscale_test.cnf b/test/maxscale_test.cnf
index 23d185eef..70b985648 100644
--- a/test/maxscale_test.cnf
+++ b/test/maxscale_test.cnf
@@ -14,7 +14,7 @@ type=monitor
 module=mariadbmon
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 monitor_interval=10000
 
 [RW-Split-Router]
@@ -22,7 +22,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 max_slave_connections=100%
 
 [SchemaRouter-Router]
@@ -30,7 +30,7 @@ type=service
 router=schemarouter
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 auth_all_servers=1
 
 [RW-Split-Hint-Router]
@@ -38,7 +38,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 max_slave_connections=100%
 filters=Hint
 
@@ -48,7 +48,7 @@ router=readconnroute
 router_options=master
 servers=server1
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 filters=QLA
 
 [Hint]
diff --git a/test/maxscale_test_secondary.cnf b/test/maxscale_test_secondary.cnf
index 67fd02054..3dbc98111 100644
--- a/test/maxscale_test_secondary.cnf
+++ b/test/maxscale_test_secondary.cnf
@@ -16,7 +16,7 @@ type=monitor
 module=mariadbmon
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 monitor_interval=10000
 
 [RW-Split-Router]
@@ -24,7 +24,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 max_slave_connections=100%
 
 [SchemaRouter-Router]
@@ -32,7 +32,7 @@ type=service
 router=schemarouter
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 auth_all_servers=1
 
 [RW-Split-Hint-Router]
@@ -40,7 +40,7 @@ type=service
 router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 max_slave_connections=100%
 filters=Hint
 
@@ -50,7 +50,7 @@ router=readconnroute
 router_options=master
 servers=server1
 user=maxuser
-passwd=maxpwd
+password=maxpwd
 
 [Hint]
 type=filter