Merge pull request #38 from bbharathkumarreddy/dev-z1

update main
bbharathkumarreddy · Feb 8, 2020 · 44dd927 · 44dd927
2 parents e529b05 + 1a80575
commit 44dd927
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/console/api/server-b-update.php b/console/api/server-b-update.php
@@ -5,7 +5,7 @@
 echo shell_exec("cd /var/www/server-b/ && git stash").'<br>';
 echo shell_exec("cd /var/www/server-b/ && git reset").'<br>';
 echo '<br><b>Info:</b>';
-echo shell_exec("cd /var/www/server-b/ && git pull origin dev-z1");
+echo shell_exec("cd /var/www/server-b/ && git pull origin master");
 echo '<br>';
 echo shell_exec("bash /var/www/server-b/bash/scripts/update-formation.sh").'<br>';
 echo shell_exec("chmod -R 777 /var/www/server-b");

diff --git a/console/app/dashboard.php b/console/app/dashboard.php
@@ -186,7 +186,7 @@
                         else $ufw_status = '';
                         ?>
                         <label class="switch fr m-0">
-                            <input type="checkbox" style="" id="ufw_status_switch" <?php echo $ufw_status; ?>>
+                            <input type="checkbox" id="ufw_status_switch" <?php echo $ufw_status; ?>>
                             <span class="slider round"></span>
                         </label>
                         <p class="text-success fr m-0">disable&nbsp;&nbsp;</p>