Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into puppeteer

Author: SolidProgramming

.vscode/launch.json

@@ -101,7 +101,7 @@
                 "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}"
             },
             "args": [
-                "-m6",
+                "-m7",
                 "-d1",
                 "-f",
                 "-s",

roles/database/files/sql/idempotent/fworch-texts.sql

@@ -2257,8 +2257,6 @@ INSERT INTO txt VALUES ('allowServiceInConn',   'German', 	'Einfache Dienste in
 INSERT INTO txt VALUES ('allowServiceInConn',   'English', 	'Allow Simple Services in Connection');
 INSERT INTO txt VALUES ('overviewDisplayLines', 'German', 	'Max. Anzahl Zeilen in Übersicht');
 INSERT INTO txt VALUES ('overviewDisplayLines', 'English', 	'Max. Number of Rows in Overview');
-INSERT INTO txt VALUES ('maxModellingTableRows', 'German', 	'Max. Anzahl Zeilen in Tabellen');
-INSERT INTO txt VALUES ('maxModellingTableRows', 'English', 'Max. Number of Rows in Tables');
 INSERT INTO txt VALUES ('reducedProtocolSet',   'German',   'Reduzierten Protokollset darstellen');
 INSERT INTO txt VALUES ('reducedProtocolSet',   'English',  'Display reduced Protocol set');
 INSERT INTO txt VALUES ('importAppDataPath',    'German', 	'Pfad und Name von Appdaten-Import (ohne Endung)');

roles/finalize/tasks/main.yml

@@ -124,6 +124,7 @@
   command: "a2dissite {{ product_name }}-maintenance"
   ignore_errors: true
   become: true
+  when: "installation_mode == 'upgrade' and 'frontends' in group_names"
 
 - name: restart apache without maintenance site
   service: