push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,74 @@
{
lib,
fetchFromGitHub,
python3,
withLdap ? false,
withPostgres ? true,
nix-update-script,
nixosTests,
}:
python3.pkgs.buildPythonApplication rec {
pname = "etebase-server";
version = "0.14.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "etesync";
repo = "server";
tag = "v${version}";
hash = "sha256-W2u/d8X8luOzgy1CLNgujnwaoO1pR1QO1Ma7i4CGkdU=";
};
patches = [ ./secret.patch ];
doCheck = false;
propagatedBuildInputs =
with python3.pkgs;
[
aiofiles
django_4
fastapi
msgpack
pynacl
redis
uvicorn
websockets
watchfiles
uvloop
pyyaml
python-dotenv
httptools
typing-extensions
]
++ lib.optional withLdap python-ldap
++ lib.optional withPostgres psycopg2;
postInstall = ''
mkdir -p $out/bin $out/lib
cp manage.py $out/bin/etebase-server
wrapProgram $out/bin/etebase-server --prefix PYTHONPATH : "$PYTHONPATH"
chmod +x $out/bin/etebase-server
'';
passthru.updateScript = nix-update-script { };
passthru.python = python3;
# PYTHONPATH of all dependencies used by the package
passthru.pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;
passthru.tests = {
nixosTest = nixosTests.etebase-server;
};
meta = {
homepage = "https://github.com/etesync/server";
description = "Etebase (EteSync 2.0) server so you can run your own";
mainProgram = "etebase-server";
changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [
felschr
phaer
];
};
}

View File

@@ -0,0 +1,26 @@
diff --git a/etebase_server/settings.py b/etebase_server/settings.py
index 9baf8d3..501d9f6 100644
--- a/etebase_server/settings.py
+++ b/etebase_server/settings.py
@@ -23,11 +22,6 @@
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
-# SECURITY WARNING: keep the secret key used in production secret!
-# See secret.py for how this is generated; uses a file 'secret.txt' in the root
-# directory
-SECRET_FILE = os.path.join(BASE_DIR, "secret.txt")
-
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
@@ -143,7 +137,7 @@
section = config["global"]
- SECRET_FILE = section.get("secret_file", SECRET_FILE)
+ SECRET_FILE = section.get("secret_file", None)
STATIC_ROOT = section.get("static_root", STATIC_ROOT)
STATIC_URL = section.get("static_url", STATIC_URL)
MEDIA_ROOT = section.get("media_root", MEDIA_ROOT)