From f08218359bedc0771ca95b401f2309b2bdb46c89 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 15 Jul 2019 08:32:15 +0200 Subject: [PATCH] security/acme-client: style sweep --- .../scripts/OPNsense/AcmeClient/certhelper.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php index ae5ac9d26..45d769682 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php @@ -137,7 +137,7 @@ function cert_action_validator($opt_cert_id) } // Allow only "revoke", "remove" and "removekey" for disabled certs. if (!in_array($options["a"], ['remove','removekey','revoke'])) { - return(1); // Cert is disabled, skip it. + return(1); // Cert is disabled, skip it. } } @@ -729,11 +729,11 @@ function run_acme_validation($certObj, $valObj, $acctObj) $proc_env['CLOUDSDK_ACTIVE_CONFIG_NAME'] = $gcloud_config; $proc_env['CLOUDSDK_CORE_PROJECT'] = $gcloud_project; # Ensure that a working gcloud config exists. - run_shell_command("/usr/local/bin/gcloud config configurations create ${gcloud_config}",$proc_env); - run_shell_command("/usr/local/bin/gcloud config configurations activate ${gcloud_config}",$proc_env); - run_shell_command("/usr/local/bin/gcloud auth activate-service-account --key-file=${gcloud_key_file}",$proc_env); - run_shell_command("/usr/local/bin/gcloud config set account ${gcloud_account}",$proc_env); - run_shell_command("/usr/local/bin/gcloud config set project ${gcloud_project}",$proc_env); + run_shell_command("/usr/local/bin/gcloud config configurations create ${gcloud_config}", $proc_env); + run_shell_command("/usr/local/bin/gcloud config configurations activate ${gcloud_config}", $proc_env); + run_shell_command("/usr/local/bin/gcloud auth activate-service-account --key-file=${gcloud_key_file}", $proc_env); + run_shell_command("/usr/local/bin/gcloud config set account ${gcloud_account}", $proc_env); + run_shell_command("/usr/local/bin/gcloud config set project ${gcloud_project}", $proc_env); break; case 'dns_gd': $proc_env['GD_Key'] = (string)$valObj->dns_gd_key; @@ -1362,7 +1362,7 @@ function dump_postponed_updates() Config::getInstance()->save(); Config::getInstance()->forceReload(); } else { - log_error(sprintf("AcmeClient: failed to store status '%s' for cert %s: node not found",$status_descr[$_statusCode],$_uuid)); + log_error(sprintf("AcmeClient: failed to store status '%s' for cert %s: node not found", $status_descr[$_statusCode], $_uuid)); } } } @@ -1388,7 +1388,7 @@ function run_shell_command($proc_cmd, $proc_env = array()) log_error(sprintf("AcmeClient: The shell command '%s' returned exit code '%d'", $proc_cmd, $result)); return($result); } else { - log_error(sprintf("AcmeClient: Unable to prepare shell command '%s'",$proc_cmd)); + log_error(sprintf("AcmeClient: Unable to prepare shell command '%s'", $proc_cmd)); return(1); } }