addtnl puppet changes

Author: danlangford

deploy/vagrant/modules/apache/manifests/init.pp

@@ -15,7 +15,7 @@
   }
 
   # Monitor the error log
-  include "apache::server::feature::monitor-logs"
+  include "apache::server::feature::monitorlogs"
 
   # Install and configure letsencrypt (SSL/certbot) for AWS instances 
   case "${ec2_services_partition}" {
@@ -49,7 +49,7 @@
   include "apache::server::vagrant"
 }
 
-class apache::server::feature::monitor-logs {
+class apache::server::feature::monitorlogs {
 
   # Install the logtail package
   package {

deploy/vagrant/modules/apache/templates/site_default.erb

@@ -9,7 +9,7 @@
     ## Set environment variables for buttonmen database access
 
     # Database 1 (primary)
-    SetEnv DB1_HOST <%= database_fqdn %>
+    SetEnv DB1_HOST <%= @database_fqdn %>
     SetEnv DB1_PORT 3306
     SetEnv DB1_NAME buttonmen
     SetEnv DB1_USER bmuser1

deploy/vagrant/modules/buttonmen/templates/apache.conf.erb

@@ -3,7 +3,7 @@
   ## Set environment variables for buttonmen database access
 
   # Database 1 (primary)
-  SetEnv DB1_HOST <%= database_fqdn %>
+  SetEnv DB1_HOST <%= @database_fqdn %>
   SetEnv DB1_PORT 3306
   SetEnv DB1_NAME <%= buttonmen_db1_name %>
   SetEnv DB1_USER <%= buttonmen_db1_user %>

deploy/vagrant/modules/buttonmen/templates/backup_database.erb

@@ -18,7 +18,7 @@ fi
 if [ -f "${CREDS_FILE}" ]; then
   . ${CREDS_FILE}
   # Need to disable GTID restores to backup/restore a remote RDS MySQL DB with default args
-  MYSQL_ARGS="-u ${BM_DB_ADMIN_USER} -p${BM_DB_ADMIN_PW} -h <%= database_fqdn %> --set-gtid-purged=OFF"
+  MYSQL_ARGS="-u ${BM_DB_ADMIN_USER} -p${BM_DB_ADMIN_PW} -h <%= @database_fqdn %> --set-gtid-purged=OFF"
 else
   MYSQL_ARGS="-u root"
 fi

deploy/vagrant/modules/buttonmen/templates/create_rds_database.erb

@@ -7,7 +7,7 @@ if [ ! -f ${CREDS_FILE} ]; then
 fi
 . ${CREDS_FILE}
 
-MYSQL_ARGS="-u ${BM_DB_ADMIN_USER} -p${BM_DB_ADMIN_PW} -h <%= database_fqdn %>" 
+MYSQL_ARGS="-u ${BM_DB_ADMIN_USER} -p${BM_DB_ADMIN_PW} -h <%= @database_fqdn %>"
 
 mysqlshow ${MYSQL_ARGS} <%= buttonmen_db1_name %> | grep -q "^Database: buttonmen"
 if [ "$?" = "0" ]; then

deploy/vagrant/modules/buttonmen/templates/mysql_root_cli.erb

@@ -9,7 +9,7 @@ DBNAME=buttonmen
 # database, and in particular an admin password
 if [ -f "${CREDS_FILE}" ]; then
   . ${CREDS_FILE}
-  MYSQL_ARGS="-u ${BM_DB_ADMIN_USER} -p${BM_DB_ADMIN_PW} -h <%= database_fqdn %>"
+  MYSQL_ARGS="-u ${BM_DB_ADMIN_USER} -p${BM_DB_ADMIN_PW} -h <%= @database_fqdn %>"
 else
   MYSQL_ARGS="-u root"
 fi

deploy/vagrant/modules/buttonmen/templates/test_config.erb

@@ -9,7 +9,7 @@ CONFIGFILE=/var/www/ui/js/Config.js
 # database, and in particular an admin password
 if [ -f "${CREDS_FILE}" ]; then
   . ${CREDS_FILE}
-  MYSQL_ARGS="-u ${BM_DB_ADMIN_USER} -p${BM_DB_ADMIN_PW} -h <%= database_fqdn %> --set-gtid-purged=OFF"
+  MYSQL_ARGS="-u ${BM_DB_ADMIN_USER} -p${BM_DB_ADMIN_PW} -h <%= @database_fqdn %> --set-gtid-purged=OFF"
 else
   MYSQL_ARGS="-u root"
 fi