public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gogs: avoid creating symlinks each run

Browse Source
This commit is contained in:
Bob van der Linden 2017-10-02 21:04:32 +02:00
parent 6dc9d21cc8
commit 9d841295f3
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/misc/gogs.nix
View File

@ -25,6 +25,7 @@ let
HTTP_ADDR = ${cfg.httpAddress} HTTP_ADDR = ${cfg.httpAddress}
HTTP_PORT = ${toString cfg.httpPort} HTTP_PORT = ${toString cfg.httpPort}
ROOT_URL = ${cfg.rootUrl} ROOT_URL = ${cfg.rootUrl}
STATIC_ROOT_PATH = ${cfg.staticRootPath}
[session] [session]
COOKIE_NAME = session COOKIE_NAME = session
@ -175,6 +176,13 @@ in
''; '';
}; };
staticRootPath = mkOption {
type = types.str;
default = "${pkgs.gogs.data}";
example = "/var/lib/gogs/data";
description = "Upper level of template and static files path.";
};
extraConfig = mkOption { extraConfig = mkOption {
type = types.str; type = types.str;
default = ""; default = "";
@ -195,6 +203,8 @@ in
runConfig = "${cfg.stateDir}/custom/conf/app.ini"; runConfig = "${cfg.stateDir}/custom/conf/app.ini";
secretKey = "${cfg.stateDir}/custom/conf/secret_key"; secretKey = "${cfg.stateDir}/custom/conf/secret_key";
in '' in ''
mkdir -p ${cfg.stateDir}
# copy custom configuration and generate a random secret key if needed # copy custom configuration and generate a random secret key if needed
${optionalString (cfg.useWizard == false) '' ${optionalString (cfg.useWizard == false) ''
mkdir -p ${cfg.stateDir}/custom/conf mkdir -p ${cfg.stateDir}/custom/conf

5
pkgs/applications/version-management/gogs/default.nix
View File

@ -33,10 +33,7 @@ buildGoPackage rec {
cp -R $src/{public,templates} $data cp -R $src/{public,templates} $data
wrapProgram $bin/bin/gogs \ wrapProgram $bin/bin/gogs \
--prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
--run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
--run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \
--run "ln -fs $data/{public,templates} ."
''; '';
goPackagePath = "github.com/gogits/gogs"; goPackagePath = "github.com/gogits/gogs";