cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/tools/admin/pgadmin/check-system-config-dir.patch

16 lines
742 B
Diff
Raw Normal View History

pgadmin4: 6.21 -> 7.0 Changelog: https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_7_0.html Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-04-14 10:35:39 +02:00
--- a/web/pgadmin/evaluate_config.py 2023-04-11 17:36:46.000000000 +0200
+++ b/web/pgadmin/evaluate_config.py 2023-04-14 09:54:33.496434314 +0200
@@ -76,6 +76,12 @@
custom_config_settings.update(config_system_settings)
pgadmin4: add option to enable desktop mode By default, pgadmin4 uses SERVER_MODE = True. This requires access to system directories (e.g. /var/lib/pgadmin). There is no easy way to change this mode during runtime. One has to change or add config files withing pgadmin's directory structure to change it or add a system-wide config file under `/etc/pgadmin`[1]. This isn't always easy to achive or may not be possible at all. For those usecases this implements a switch in the pgadmin4 derivation and adds a new top-level package `pgadmin4-desktopmode`. This builds in DESKTOP MODE and allows the usage of pgadmin4 without the nixOS module and without access to system-wide directories. pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py pgadmin4-desktopmode tries to read that as well. This normally fails with a PermissionError, as the config file is owned by the user of the pgadmin module. With the check-system-config-dir.patch this will just throw a warning but will continue and not read the file. If we run pgadmin4-desktopmode as root (something one really shouldn't do), it can read the config file and fail, because of the wrong config for desktopmode. [1]https://www.pgadmin.org/docs/pgadmin4/latest/config_py.html Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-07 12:23:24 +01:00
except ImportError:
pass
+ except PermissionError:
+ print(f"Permission denied to open {str(system_config_dir + '/config_system.py')}. \n \
+ If you are running pgadmin4-desktopmode please make sure you disable \n \
+ the pgadmin NixOS module first. If you rely on settings in \n \
+ {str(system_config_dir + '/config_system.py')}, please check the correct permissions.")
+ pass
pgadmin4: 6.21 -> 7.0 Changelog: https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_7_0.html Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-04-14 10:35:39 +02:00
def evaluate_and_patch_config(config: dict) -> dict:
Reference in a new issue Copy permalink