diff --git a/mod-seafile-server.nix b/mod-seafile-server.nix index 6c4a427..4b65806 100644 --- a/mod-seafile-server.nix +++ b/mod-seafile-server.nix @@ -37,20 +37,10 @@ in default = "seafile"; description = "Database user name. Not required for sqlite."; }; - dbnameSeafile = mkOption { + dbname = mkOption { type = types.nullOr types.str; default = "seafile"; - description = "Database name for Seafile server. Not required for sqlite."; - }; - dbnameCcnet = mkOption { - type = types.nullOr types.str; - default = "seafile"; - description = "Database name for Ccnet server. Not required for sqlite."; - }; - dbnameSeahub = mkOption { - type = types.nullOr types.str; - default = "seafile"; - description = "Database name for Seahub web interface. Not required for sqlite."; + description = "Database name. Not required for sqlite."; }; passwordFile = mkOption { type = types.nullOr types.str; @@ -84,11 +74,11 @@ in description = "Group account under which the Seafile server runs."; }; - name = mkOption { - type = types.str; - default = "Seafile"; - description = "name of the Seafile instance, will show up in client and web interface"; - }; +# name = mkOption { +# type = types.str; +# default = "Seafile"; +# description = "name of the Seafile instance, will show up in client and web interface"; +# }; domainName = mkOption { type = types.str; @@ -249,7 +239,7 @@ in echo "[General]" > ./conf/ccnet.conf grep "^ID =" ./ccnet/ccnet.conf.template >> ./conf/ccnet.conf # outside URL - SERVICE_URL="http${if cfg.enableTLS then "s" else ""}://${cfg.domainName}:${toString cfg.externalPort}" + SERVICE_URL = http${if cfg.enableTLS then "s" else ""}://${cfg.domainName}:${toString cfg.externalPort} # seafile.conf generation @@ -264,19 +254,8 @@ in } - ln -sf ${pkgs.seafile-server} seafile-server - ./seafile-server/setup-seafile-mysql.sh \ - -n "${cfg.name}" \ - -i "${cfg.domainName}" \ - -p "${toString cfg.fileserverPort}" \ - -d "${cfg.storagePath}" \ - -o "${cfg.db.host}" \ - -t "${toString cfg.db.dbport}" \ - -u "${cfg.db.user}" \ - -w "$DBPASS" \ - -c "${cfg.db.dbnameCcnet}" \ - -s "${cfg.db.dbnameSeafile}" \ - -b "${cfg.db.dbnameSeahub}" + ln -s ${pkgs.seafile-server} seafile-server + ./seafile-server/seafile-server-latest/bin/seafile-admin setup ''}") ]; User = cfg.user; diff --git a/seafile-server/default.nix b/seafile-server/default.nix index c2e5f67..f5aba5d 100644 --- a/seafile-server/default.nix +++ b/seafile-server/default.nix @@ -28,7 +28,7 @@ , python3Packages }: let - version = "8.0.2"; + version = "8.0.1"; python = python3; pythonPackages = python3Packages; django = pythonPackages.django; @@ -56,7 +56,7 @@ let owner = "haiwen"; repo = "seafile-server"; rev = "v${version}-server"; - sha256 = "09zzgygyxgfdx7mjzcvww7c0gv82cmfgbscssyy886sbmjw2d9kc"; + sha256 = "0brjmibg1vd1v6f2ybl1xr0ivf5kc8qg7fy4h204adnc0wkvjkrf"; }; # patch to work with latest, non-vulnerable libevhtp patches = [ @@ -92,7 +92,7 @@ let owner = "haiwen"; repo = "seahub"; rev = "v${version}-server"; - sha256 = "0967nx6qk6dpk2lxydn6qzi8fwym5s0yfqja7sdh48ksk77v9hiq"; + sha256 = "16lf88j6sjxm5scx4db4bljsbksv27xr6w9rcvcnjba0fkabrlir"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; buildInputs = [ python pythonPackages.wrapPython ];