fixes #1

Merge branch 'upgrade-2' of ssh://gitea.service.nr5:2222/maketank/Froxlor into upgrade-2

.drone.yml

@@ -0,0 +1,40 @@
+kind: pipeline
+name: deploy-froxlor
+type: docker
+
+platform:
+  os: linux
+  arch: arm64
+
+trigger:
+  branch:
+    - upgrade-2
+  event:
+    include:
+     - push
+     
+steps:
+- name: deploy
+  image: cr.wks/drone/drone-rsync:latest
+  settings:
+    hosts: ["rechner02.maketank.net"]
+    source: ./
+    target: ~/froxlor-test
+    user: www-data
+    exclude: ['vendor', '.git*', '*drone.yml', '.settings', '.buildpath', '.editorconfig', '.project', '.travis.yml']
+    args: '-v --delete'
+    log_level: quiet
+    key: 
+      from_secret: ssh-www-data-maketank-rsa
+    command_timeout: 10m
+- name: compose-install
+  image: appleboy/drone-ssh
+  settings:
+    host:
+        - rechner02.maketank.net
+    username: www-data
+    key:
+        from_secret: ssh-www-data-maketank-rsa
+    script:
+        - cd ~/froxlor-test && composer install --no-dev
+        

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");

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;