From 8f1bc31c40f095893392201d8eaa709731d7acb2 Mon Sep 17 00:00:00 2001
From: Daniel Seifert <git@daniel-seifert.com>
Date: Thu, 17 Oct 2024 08:50:46 +0200
Subject: [PATCH] align option names

---
 deploy.php    | 12 ++++++------
 inventory.yml | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/deploy.php b/deploy.php
index c7acb80..7d56265 100644
--- a/deploy.php
+++ b/deploy.php
@@ -24,11 +24,11 @@ task('deploy:d3OxidTasks', [
 desc('set shops offline');
 task('deploy:setShopsOffline', function() {
     if (has('bin/mysql') && strlen(get('bin/mysql')) &&
-        has('dbName') && strlen(get('dbName')) &&
-        has('dbConfPath') && strlen(get('dbConfPath')) && test("[ -f {{dbConfPath}} ]")
+        has('db_name') && strlen(get('db_name')) &&
+        has('db_conf_path') && strlen(get('db_conf_path')) && test("[ -f {{db_conf_path}} ]")
     ) {
         $query = "UPDATE oxshops SET oxactive = '0', OXREGISTERSUBJECT = CONCAT('..', OXREGISTERSUBJECT) WHERE oxactive = '1';";
-        run('{{bin/mysql}} --defaults-extra-file={{dbConfPath}} {{dbName}} -e "'.$query.'"');
+        run('{{bin/mysql}} --defaults-extra-file={{db_conf_path}} {{db_name}} -e "'.$query.'"');
     } else {
         info('missing config, task skipped');
     }
@@ -37,11 +37,11 @@ task('deploy:setShopsOffline', function() {
 desc('set shops online');
 task('deploy:setShopsOnline', function() {
     if (has('bin/mysql') && strlen(get('bin/mysql')) &&
-        has('dbName') && strlen(get('dbName')) &&
-        has('dbConfPath') && strlen(get('dbConfPath')) && test("[ -f {{dbConfPath}} ]")
+        has('db_name') && strlen(get('db_name')) &&
+        has('db_conf_path') && strlen(get('db_conf_path')) && test("[ -f {{db_conf_path}} ]")
     ) {
         $query = "UPDATE oxshops SET oxactive = '1', OXREGISTERSUBJECT = SUBSTR(OXREGISTERSUBJECT, 3) WHERE oxactive = '0' AND OXREGISTERSUBJECT LIKE '..%';";
-        run('{{bin/mysql}} --defaults-extra-file={{dbConfPath}} {{dbName}} -e "'.$query.'"');
+        run('{{bin/mysql}} --defaults-extra-file={{db_conf_path}} {{db_name}} -e "'.$query.'"');
     } else {
         info('missing config, task skipped');
     }
diff --git a/inventory.yml b/inventory.yml
index 70d48c8..9382ed7 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -8,11 +8,11 @@ config:
 .base: &base
   local: true
   deploy_path: /home/XXX/{{application}}_{{alias}}
-  dbConfPath: /home/phfhcwoc/dbConf/my_{{alias}}.cnf
+  db_conf_path: /home/XXX/dbConf/my_{{alias}}.cnf   # optional for database actions
   shared_files:
   - .htaccess
   - .htpasswd
-  - .env                  # otherwise source/config.inc.php
+  - .env                                                 # otherwise source/config.inc.php
   shared_dirs:
   - source/sitemaps
   - source/export
@@ -28,14 +28,14 @@ hosts:
   production:
     <<: *base
     branch: rel_7.0.x
-    dbName: myProdDatabase
+    db_name: myProdDatabase                              # optional for database actions
     labels:
-      role: production      # production | stage | development
+      role: production                                   # production | stage | development
 
   development:
     <<: *base
     branch: dev_7.1.x
-    dbName: myDevDatabase
+    db_name: myDevDatabase                               # optional for database actions
     keep_releases: 1
     composer_options: --verbose --prefer-dist --no-progress --no-interaction  # without no-dev option
     labels: