diff options
author | Robin Gloster <mail@glob.in> | 2016-10-17 12:51:06 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-12-29 00:41:42 +0100 |
commit | d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a (patch) | |
tree | 1c938ba5b306ad551b8b9a57a093e76f38ac890a /nixos/modules/services/web-apps | |
parent | 5306122333278e7f53fa387c1a7b784720fb74fc (diff) | |
download | nixlib-d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a.tar nixlib-d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a.tar.gz nixlib-d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a.tar.bz2 nixlib-d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a.tar.lz nixlib-d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a.tar.xz nixlib-d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a.tar.zst nixlib-d8ef63fc73ca169aa6d022c9ed7f10c57a5a5a9a.zip |
crowd module: fix OpenID server
Diffstat (limited to 'nixos/modules/services/web-apps')
-rw-r--r-- | nixos/modules/services/web-apps/atlassian/crowd.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 5e79678023da..ada26f8057ba 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -6,7 +6,12 @@ let cfg = config.services.crowd; - pkg = pkgs.atlassian-crowd; + pkg = pkgs.atlassian-crowd.override { + home = cfg.home; + port = cfg.listenPort; + proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}"; + openidPassword = cfg.openidPassword; + }; in @@ -45,6 +50,11 @@ in description = "Port to listen on."; }; + openidPassword = mkOption { + type = types.str; + description = "Application password for OpenID server."; + }; + catalinaOptions = mkOption { type = types.listOf types.str; default = []; @@ -119,10 +129,10 @@ in }; preStart = '' - mkdir -p ${cfg.home}/{logs,work} + mkdir -p ${cfg.home}/{logs,work,database} mkdir -p /run/atlassian-crowd - ln -sf ${cfg.home}/{work,server.xml} /run/atlassian-crowd + ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd chown -R ${cfg.user} ${cfg.home} @@ -134,7 +144,6 @@ in ''; script = "${pkg}/start_crowd.sh"; - #stopScript = "${pkg}/bin/stop_crowd.sh"; serviceConfig = { User = cfg.user; |