From 25136ad244e2f9870272df0dca09c7df5960517f Mon Sep 17 00:00:00 2001
From: "Chris H (KruftMaster)" <ball@bag.com>
Date: Thu, 8 Sep 2016 13:10:50 +0100
Subject: [PATCH] Fixing MySQL params
---
manifests/config.pp | 8 ++++----
templates/move-data-to-mysql.sh.erb | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/manifests/config.pp b/manifests/config.pp
index 3509b42..9467d35 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -20,10 +20,10 @@
# Prepapre the database paths (MySQL or SQLite):
if $openvpn_as::use_mysql {
- $openvpn_certs_db = "mysql://${openvpn_mysql_username}:${openvpn_mysql_password}@${openvpn_mysql_host}/as_certs"
- $openvpn_user_prop_db = "mysql://${openvpn_mysql_username}:${openvpn_mysql_password}@${openvpn_mysql_host}/as_userprop"
- $openvpn_config_db = "mysql://${openvpn_mysql_username}:${openvpn_mysql_password}@${openvpn_mysql_host}/as_config"
- $openvpn_log_db = "mysql://${openvpn_mysql_username}:${openvpn_mysql_password}@${openvpn_mysql_host}/as_log"
+ $openvpn_certs_db = "mysql://${mysql_username}:${mysql_password}@${mysql_host}/as_certs"
+ $openvpn_user_prop_db = "mysql://${mysql_username}:${mysql_password}@${mysql_host}/as_userprop"
+ $openvpn_config_db = "mysql://${mysql_username}:${mysql_password}@${mysql_host}/as_config"
+ $openvpn_log_db = "mysql://${mysql_username}:${mysql_password}@${mysql_host}/as_log"
} else {
$openvpn_certs_db = 'sqlite:///~/db/certs.db'
$openvpn_user_prop_db = 'sqlite:///~/db/userprop.db'
diff --git a/templates/move-data-to-mysql.sh.erb b/templates/move-data-to-mysql.sh.erb
index b8e186d..2045e17 100644
--- a/templates/move-data-to-mysql.sh.erb
+++ b/templates/move-data-to-mysql.sh.erb
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-MYSQL_USER='<%= @openvpn_mysql_username %>'
-MYSQL_PASS='<%= @openvpn_mysql_password %>'
-MYSQL_HOST='<%= @openvpn_mysql_host %>'
+MYSQL_USER='<%= @mysql_username %>'
+MYSQL_PASS='<%= @mysql_password %>'
+MYSQL_HOST='<%= @mysql_host %>'
echo "/usr/local/openvpn_as/scripts/dbcvt -t certs -s sqlite:////usr/local/openvpn_as/etc/db/certs.db -d 'mysql://${MYSQL_USER}:${MYSQL_PASS}@${MYSQL_HOST}/as_certs'"
echo "/usr/local/openvpn_as/scripts/dbcvt -t config -s sqlite:////usr/local/openvpn_as/etc/db/config.db -d 'mysql://${MYSQL_USER}:${MYSQL_PASS}@${MYSQL_HOST}/as_config'"