diff --git a/includes/dbdetect.class.sh b/includes/dbdetect.class.sh index ab2f32dd075ec031d3cc8f0e68aaa6be61fc49c1..2a366c2474d17814434a4b0123d4bf6211ad0d41 100644 --- a/includes/dbdetect.class.sh +++ b/includes/dbdetect.class.sh @@ -179,11 +179,11 @@ function dbdetect.exists(){ for mykey in env params do value="$( ini.value "$mykey" )" - value="${value//\{\{tcp-port\}\}/$tcpport}" - value="${value//\{\{tcp-target\}\}/$tcptarget}" - value="${value//\{\{dbuser\}\}/$dbuser}" - value="${value//\{\{dbpassword\}\}/$dbpassword}" - value="${value//\{\{file\[\]\}\}/$myfiles}" + value="${value//\{tcp-port\}/$tcpport}" + value="${value//\{tcp-target\}/$tcptarget}" + value="${value//\{dbuser\}/$dbuser}" + value="${value//\{dbpassword\}/$dbpassword}" + value="${value//\{file\[\]\}/$myfiles}" DBD_PARAMS[$mykey]="$value" dbdetect._wd ">>> $mykey = $value" diff --git a/plugins/localdump/profiles/couchdb2.ini b/plugins/localdump/profiles/couchdb2.ini index b31a78b4eb69fea85e901fe62aa5ad75a305f80e..6462a8cc9c83ada0d4581ffeec3523331cdaad1b 100644 --- a/plugins/localdump/profiles/couchdb2.ini +++ b/plugins/localdump/profiles/couchdb2.ini @@ -18,6 +18,6 @@ dbuser = 'admin' dbpassword = 'HereIsMyAdminPassword' params = '' -env = 'export COUCH_URL=http://{{dbuser}}:{{dbpassword}}@{{tcp-target}}:{{tcp-port}}/' +env = 'export COUCH_URL=http://{dbuser}:{dbpassword}@{tcp-target}:{tcp-port}/' # ---------------------------------------------------------------------- diff --git a/plugins/localdump/profiles/mysql_localhost_docker_13306.ini.example b/plugins/localdump/profiles/mysql_localhost_docker_13306.ini.example index 7c9d906a77216bd65636fa9998768966b3c3115c..3cabdc29f118176270c5e82e3a437ac50e39c485 100644 --- a/plugins/localdump/profiles/mysql_localhost_docker_13306.ini.example +++ b/plugins/localdump/profiles/mysql_localhost_docker_13306.ini.example @@ -32,7 +32,7 @@ dbuser = 'root' dbpassword = '12345678' # unschön - das ist in der Prozessliste -params = '--port={{tcp-port}} --password={{dbpassword}} --user={{dbuser}} --host={{tcp-target}}' +params = '--port={tcp-port} --password={dbpassword} --user={dbuser} --host={tcp-target}' # https://dev.mysql.com/doc/refman/8.0/en/environment-variables.html env = '' diff --git a/plugins/localdump/profiles/pgsql.ini b/plugins/localdump/profiles/pgsql.ini index bbb24f6b4b5cc8a11d17de74e12514a692ccb995..09e79fe41c95917770edd687e6ce29f21f20058f 100644 --- a/plugins/localdump/profiles/pgsql.ini +++ b/plugins/localdump/profiles/pgsql.ini @@ -26,7 +26,7 @@ dbpassword = '' ; -w, --no-password never prompt for password ; -W, --password force password prompt (should happen automatically) ; -# params = '--host= {{tcp-target}} --port={{tcp-port}} --username={{dbuser}} --no-password' +# params = '--host= {tcp-target} --port={tcp-port} --username={dbuser} --no-password' # https://www.postgresql.org/docs/current/libpq-envars.html diff --git a/plugins/localdump/profiles/pgsql_remote.ini.example b/plugins/localdump/profiles/pgsql_remote.ini.example index 92496110daffa07268bad1a3be7148bdd350fedd..98b728a93f0ef7308d7fc1aced72ebfda4778c3c 100644 --- a/plugins/localdump/profiles/pgsql_remote.ini.example +++ b/plugins/localdump/profiles/pgsql_remote.ini.example @@ -19,7 +19,7 @@ su = '' dbuser = 'mydbuser' dbpassword = 'mypassword' -params = '--host= {{tcp-target}} --port={{tcp-port}} --username={{dbuser}}' +params = '--host= {tcp-target} --port={tcp-port} --username={dbuser}' env = 'PGPASSWORD={{dbpassword}}' # https://www.postgresql.org/docs/current/libpq-envars.html diff --git a/plugins/localdump/profiles/readme.md b/plugins/localdump/profiles/readme.md index 577cdbb3bebf700a25240577203151b900dc667f..f6269be82dd962d71f415d7de56ae09436de5000 100644 --- a/plugins/localdump/profiles/readme.md +++ b/plugins/localdump/profiles/readme.md @@ -64,12 +64,12 @@ If a profile detection was successful then values in the [set] section will be a Replacements that can be used for values `params` and `env`: -| Key | Description | -|--- |--- | -| {{dbpassword}} | value of [set] -> dbpassword -| {{dbuser}} | value of [set] -> dbuser -| {{tcp-port}} | value of [detect] -> tcp-port -| {{tcp-target}} | value of [detect] -> tcp-target +| Key | Description | +|--- |--- | +| {dbpassword} | value of [set] -> dbpassword +| {dbuser} | value of [set] -> dbuser +| {tcp-port} | value of [detect] -> tcp-port +| {tcp-target} | value of [detect] -> tcp-target ```ini [set] @@ -77,7 +77,7 @@ Replacements that can be used for values `params` and `env`: su = '' dbuser = 'root' dbpassword = '12345678' -params = '--port={{tcp-port}} --password={{dbpassword}} --user={{dbuser}} --host={{tcp-target}}' +params = '--port={tcp-port} --password={dbpassword} --user={dbuser} --host={tcp-target}' env = 'export var1="happy meal"; export var2="new"; export var3="year!"'