From 8ee3f9d607353b04871235d1f374ee84e086df53 Mon Sep 17 00:00:00 2001
From: Robert <Robert@TryingToScale.com>
Date: Wed, 6 Dec 2023 19:27:26 -0500
Subject: [PATCH] a,b

---
 app/neato_common.php              | 10 +++++++---
 app/neato_fns.php                 |  6 +++---
 config_files/deploy_mysql_ex1.php | 20 ++++++++++----------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/neato_common.php b/app/neato_common.php
index 25e4351..b1c7b2d 100644
--- a/app/neato_common.php
+++ b/app/neato_common.php
@@ -92,9 +92,13 @@ function ln($source, $new_link) {
 }
 
 function make_dir($new_folder) {
-    $exit_code = mkdir($new_folder, 0777, true);
-    check_for_error($exit_code, "Unable to mkdir: {$new_folder}");
-    return $exit_code;
+    if (!is_dir($new_folder)) {
+        $exit_code = mkdir($new_folder, 0775, true);
+        check_for_error($exit_code, "Unable to mkdir: {$new_folder}");
+        return $exit_code;
+    } else {
+        return true;
+    }    
 }
 
 function chmod_file_or_dir($file, $kind) {
diff --git a/app/neato_fns.php b/app/neato_fns.php
index 39beef1..6fcdf83 100644
--- a/app/neato_fns.php
+++ b/app/neato_fns.php
@@ -139,14 +139,14 @@ function file_loop($data) {
                 foreach ($v as $a => $b) {
                     $a = (isset($a) && !empty($a)) ? $a : false;
                     $b = (isset($b) && !empty($b)) ? $b : false;
-                    if ($b !== false) {
-                        if ($a !== false) {
+                    if ($a !== false) {
+                        if ($b !== false) {
                             $ret = $command($a, $b);
                             if ($ret === false) {
                                 $retval = false;
                             }
                         } else {
-                            $ret = $command($b);
+                            $ret = $command($a);
                             if ($ret === false) {
                                 $retval = false;
                             }
diff --git a/config_files/deploy_mysql_ex1.php b/config_files/deploy_mysql_ex1.php
index c074157..f0df7f7 100644
--- a/config_files/deploy_mysql_ex1.php
+++ b/config_files/deploy_mysql_ex1.php
@@ -6,26 +6,26 @@ Configure::set('passwords', ['length' => rand(16, 26)]);
 
 $root_password = make_password(Configure::get('passwords', 'length'));
 
-Configure::set('post_actions', [
-	'chmod_file_or_dir' => [ $cwd . '/mysecret' => 'secret' ]
+Configure::set('pre_actions', [
+        'make_dir' => [$cwd . '/my_vaults'=>'', '/etc/neato_secrets'=>''],
+        'chmod_file_or_dir' => 
+  [ $cwd . '/my_vaults' => 'secret', '/etc/neato_secrets' => 'secret' ],
 ]); 
 
 //do_command('service', 'mysql', 'stop');
 
 force_root();
 
-$my_key = Enc::make_key_file("/etc/secrets_mysql");
+file_loop(Configure::get('pre_actions'));
+
+$my_key = Enc::make_key_file("/etc/neato_secrets/mysql_data");
 
 $obj = new stdClass();
 $obj->root = $root_password;
-Enc::encode_file("mysecret", $obj, $my_key);
+Enc::encode_file($cwd . "/my_vaults/my_secrets", $obj, $my_key);
 
-//$my_key = read_file("/etc/secrets_mysql");
-//$o = Enc::decode_file("mysecret", $my_key);
+//$my_key = read_file("/etc/neato_secrets/mysql_data");
+//$o = Enc::decode_file($cwd . "/my_vaults/my_secrets", $my_key);
 //echo $o->root;
 
-
-//write_file('mysecret', $root_password);
-//file_loop(Configure::get('post_actions'));
-
 //do_command('service', 'mysql', 'start');
\ No newline at end of file