diff options
| author | Robin Gloster <mail@glob.in> | 2019-01-08 17:56:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 17:56:13 +0000 |
| commit | c75571d66cd2cb4e7f1529950e6dfb4afbcdd37b (patch) | |
| tree | 215fb2e8a56fc15f27a986c05eac6ef6d9a85da9 /nixos/modules | |
| parent | f7367cbf1c0179fed1301c75a789230e431fdc4d (diff) | |
| parent | 6f02b8672645ec02967799237b37d3a3825bffc6 (diff) | |
| download | nixlib-c75571d66cd2cb4e7f1529950e6dfb4afbcdd37b.tar nixlib-c75571d66cd2cb4e7f1529950e6dfb4afbcdd37b.tar.gz nixlib-c75571d66cd2cb4e7f1529950e6dfb4afbcdd37b.tar.bz2 nixlib-c75571d66cd2cb4e7f1529950e6dfb4afbcdd37b.tar.lz nixlib-c75571d66cd2cb4e7f1529950e6dfb4afbcdd37b.tar.xz nixlib-c75571d66cd2cb4e7f1529950e6dfb4afbcdd37b.tar.zst nixlib-c75571d66cd2cb4e7f1529950e6dfb4afbcdd37b.zip | |
Merge pull request #53598 from mayflower/atlassian-updates
atlassian updates
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/confluence.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/crowd.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/jira.nix | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index f896d92fd6fc..b71887fcc6ee 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -166,7 +166,7 @@ in ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/confluence ln -sf ${cfg.home} /run/confluence/home - chown -R ${cfg.user} ${cfg.home} + chown ${cfg.user} ${cfg.home} sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index b6cb9f3b7c41..9f48d1e16a44 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -130,9 +130,10 @@ in mkdir -p ${cfg.home}/{logs,database,work} mkdir -p /run/atlassian-crowd - ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd + ln -sf ${cfg.home}/{database,logs,work,server.xml} /run/atlassian-crowd - chown -R ${cfg.user}:${cfg.group} ${cfg.home} + chown ${cfg.user}:${cfg.group} ${cfg.home} + chown ${cfg.user}:${cfg.group} ${cfg.home}/{logs,database,work} sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index f5ec0a5f31b8..dba970c612bc 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -171,7 +171,7 @@ in ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/atlassian-jira ln -sf ${cfg.home} /run/atlassian-jira/home - chown -R ${cfg.user} ${cfg.home} + chown ${cfg.user} ${cfg.home} sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' |