fix apache reset

bshp · Jan 31, 2024 · 723cf46 · 723cf46
1 parent e34ff5d
commit 723cf46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/usr/lib/ocie/include/config/apache b/src/usr/lib/ocie/include/config/apache
@@ -32,23 +32,23 @@ function reset_config()
     SITE_TEMPLATE=/etc/apache2/sites-available;
 
     if [[ -f "${APACHE_MODS}/rewrite.conf" ]];then
-        mv -f "${APACHE_MODS}/rewrite.conf" ./rewrite.conf.previous;
+        mv -f "${APACHE_MODS}/rewrite.conf" "${APACHE_MODS}/rewrite.conf.previous";
     fi;
     if [[ -f "${APACHE_MODS}/headers.conf" ]];then
-        mv -f "${APACHE_MODS}/headers.conf" ./headers.conf.previous;
+        mv -f "${APACHE_MODS}/headers.conf" "${APACHE_MODS}/headers.conf.previous";
     fi;
     if [[ -f "${APACHE_MODS}/jk.conf" ]];then
-        mv -f "${APACHE_MODS}/jk.conf" ./jk.conf.previous;
+        mv -f "${APACHE_MODS}/jk.conf" "${APACHE_MODS}/jk.conf.previous";
     fi;
     if [[ -f "${APACHE_MODS}/jk.load" ]];then
-        mv -f "${APACHE_MODS}/jk.load" ./jk.load.previous;
+        mv -f "${APACHE_MODS}/jk.load" "${APACHE_MODS}/jk.load.previous";
     fi;
     if [[ -f "${APACHE_SITES}/000-default.conf" ]];then
-        mv -f "${APACHE_SITES}/000-default.conf" ./000-default.conf.previous;
+        mv -f "${APACHE_SITES}/000-default.conf" "${APACHE_SITES}/000-default.conf.previous";
         cp -f "${SITE_TEMPLATE}/000-default.conf.dist" "${APACHE_SITES}/000-default.conf";
     fi;
     if [[ -f "${APACHE_SITES}/default-ssl.conf" ]];then
-        mv -f "${APACHE_SITES}/default-ssl.conf" ./default-ssl.conf.previous;
+        mv -f "${APACHE_SITES}/default-ssl.conf" "${APACHE_SITES}/default-ssl.conf.previous";
         cp -f "${SITE_TEMPLATE}/default-ssl.conf.dist" "${APACHE_SITES}/default-ssl.conf";
     fi;
 }

diff --git a/src/usr/sbin/ociectl b/src/usr/sbin/ociectl
@@ -55,8 +55,7 @@ function ocie_certs()
             app_certs;
         fi;
     else
-        echo "Ocie: CA Import is DISABLED, skipping";
-        echo "Ocie: Set CA_ENABLED=1 in order activate";
+        echo "Ocie: CA Import is DISABLED, set CA_ENABLED=1 in order activate, skipping..";
     fi;
 }
 
@@ -74,8 +73,7 @@ function ocie_keys()
             app_keys;
         fi;
     else
-        echo "Ocie: Certificate keygen is DISABLED, skipping";
-        echo "Ocie: Set CERT_ENABLED=1 in order activate";
+        echo "Ocie: Certificate keygen is DISABLED, set CERT_ENABLED=1 in order activate, skipping..";
     fi;
 }
 
@@ -86,8 +84,7 @@ function ocie_update()
             app_update;
         fi;
     else
-        echo "Ocie: App Deployment/Update is DISABLED, skipping";
-        echo "Ocie: Set APP_DEPLOY=1 in order activate";
+        echo "Ocie: App Deployment/Update is DISABLED, set APP_DEPLOY=1 in order activate, skipping..";
     fi;
 }