This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/Configuration/RequestMiddlewares.php 1970-01-01 01:00:00.000000000 +0100 | |
+++ b/Configuration/RequestMiddlewares.php 2020-02-16 18:59:57.000000000 +0100 | |
@@ -0,0 +1,11 @@ | |
+<?php | |
+return [ | |
+ 'frontend' => [ | |
+ 'srfreecap-eidhandler' => [ | |
+ 'target' => \SJBR\SrFreecap\Middleware\EidHandler::class, | |
+ 'before' => [ | |
+ 'typo3/cms-frontend/content-length-headers', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/var/log/backintime { | |
weekly | |
missingok | |
rotate 8 | |
compress | |
delaycompress | |
notifempty | |
create 644 root adm | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
define host{ | |
use generic-host | |
host_name localhost | |
address 127.0.0.1 | |
} | |
define service{ | |
use generic-service | |
host_name localhost | |
service_description BackInTime Profile 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/qt/backintime-qt_polkit b/qt/backintime-qt_polkit | |
index 89ffd56..c5335a1 100644 | |
--- a/qt/backintime-qt_polkit | |
+++ b/qt/backintime-qt_polkit | |
@@ -1,2 +1,2 @@ | |
#!/bin/sh | |
-pkexec --disable-internal-agent "/usr/bin/backintime-qt" "$@" | |
+pkexec --disable-internal-agent env QT_QPA_PLATFORM=wayland-egl XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR "/usr/bin/backintime-qt" "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/common/tools.py b/common/tools.py | |
index e1da01b..5b36682 100644 | |
--- a/common/tools.py | |
+++ b/common/tools.py | |
@@ -189,7 +189,7 @@ def make_dirs( path ): | |
os.makedirs( path ) | |
except Exception as e: | |
logger.error("Failed to make dirs '%s': %s" | |
- %(path, str(e)), self, 1) | |
+ %(path, str(e)), traceDepth = 1) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/common/tools.py b/common/tools.py | |
index e1da01b..c13fb06 100644 | |
--- a/common/tools.py | |
+++ b/common/tools.py | |
@@ -597,6 +597,8 @@ def keyring_supported(): | |
except: pass | |
try: backends.append(keyring.backends.kwallet.Keyring) | |
except: pass | |
+ try: backends.append(keyring.backends.kwallet.DBusKeyring) | |
+ except: pass |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git /usr/share/applications/backintime-qt4-root.desktop.sic /usr/share/applications/backintime-qt4-root.desktop | |
index fef451b..61794c6 100644 | |
--- /usr/share/applications/backintime-qt4-root.desktop.sic | |
+++ /usr/share/applications/backintime-qt4-root.desktop | |
@@ -1,7 +1,7 @@ | |
[Desktop Entry] | |
Name=Back In Time (root) | |
GenericName=Backup | |
-Exec=pkexec backintime-qt4 | |
+Exec=/usr/bin/backintime-qt4_polkit %f |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/qt4/backintime-qt4-root.desktop b/qt4/backintime-qt4-root.desktop | |
index fef451b..61794c6 100644 | |
--- a/qt4/backintime-qt4-root.desktop | |
+++ b/qt4/backintime-qt4-root.desktop | |
@@ -1,7 +1,7 @@ | |
[Desktop Entry] | |
Name=Back In Time (root) | |
GenericName=Backup | |
-Exec=pkexec backintime-qt4 | |
+Exec=/usr/bin/backintime-qt4_polkit %f |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/common/tools.py b/common/tools.py | |
index 62e0b6a..7ef5b5f 100644 | |
--- a/common/tools.py | |
+++ b/common/tools.py | |
@@ -32,7 +32,8 @@ keyring_warn = False | |
try: | |
if os.getenv('BIT_USE_KEYRING', 'true') == 'true' and os.geteuid() != 0: | |
import keyring | |
-except: | |
+except Exception as e: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
=== modified file 'common/config.py' | |
--- common/config.py 2015-09-28 20:19:24 +0000 | |
+++ common/config.py 2015-12-13 19:32:09 +0000 | |
@@ -28,8 +28,8 @@ | |
import getpass | |
pwd = None | |
+import tools | |
import configfile | |
-import tools |
NewerOlder