From 97cf30ed7a8b0ed50129977923bbaa31ff3bc1e1 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Wed, 6 Dec 2023 19:52:30 +0100
Subject: [PATCH] we don't have that column

---
 .drone.yml                                 | 2 +-
 install/updates/froxlor/update_2.1.inc.php | 4 ++--
 scripts/froxlor_master_cronjob.php         | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 scripts/froxlor_master_cronjob.php

diff --git a/.drone.yml b/.drone.yml
index 524f40b3..d3da8cc6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ platform:
 
 trigger:
   branch:
-    - 2.1.x
+    - upgrade-2
   event:
     include:
      - push
diff --git a/install/updates/froxlor/update_2.1.inc.php b/install/updates/froxlor/update_2.1.inc.php
index 53432dd9..322156c0 100644
--- a/install/updates/froxlor/update_2.1.inc.php
+++ b/install/updates/froxlor/update_2.1.inc.php
@@ -37,8 +37,8 @@ if (!defined('_CRON_UPDATE')) {
 }
 
 if (Froxlor::isDatabaseVersion('202304260')) {
-	Update::showUpdateStep("Cleaning domains table");
-	Database::query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` DROP COLUMN `ismainbutsubto`;");
+	//Update::showUpdateStep("Cleaning domains table");
+	//Database::query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` DROP COLUMN `ismainbutsubto`;");
 	Update::lastStepStatus(0);
 
 	Update::showUpdateStep("Creating new tables and fields");
diff --git a/scripts/froxlor_master_cronjob.php b/scripts/froxlor_master_cronjob.php
new file mode 100644
index 00000000..228b61df
--- /dev/null
+++ b/scripts/froxlor_master_cronjob.php
@@ -0,0 +1,5 @@
+<?php
+chmod('/app//bin/froxlor-cli', 0755);
+// re-create cron.d configuration file
+exec('/app//bin/froxlor-cli froxlor:cron -r 99');
+exit;
\ No newline at end of file