diff options
Diffstat (limited to 'modules/private/websites/tools/diaspora/default.nix')
-rw-r--r-- | modules/private/websites/tools/diaspora/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix index 663fe88..9119ead 100644 --- a/modules/private/websites/tools/diaspora/default.nix +++ b/modules/private/websites/tools/diaspora/default.nix | |||
@@ -16,16 +16,14 @@ in { | |||
16 | }; | 16 | }; |
17 | users.users.diaspora.extraGroups = [ "keys" ]; | 17 | users.users.diaspora.extraGroups = [ "keys" ]; |
18 | 18 | ||
19 | secrets.keys = [ | 19 | secrets.keys = { |
20 | { | 20 | "webapps/diaspora" = { |
21 | dest = "webapps/diaspora"; | ||
22 | isDir = true; | 21 | isDir = true; |
23 | user = "diaspora"; | 22 | user = "diaspora"; |
24 | group = "diaspora"; | 23 | group = "diaspora"; |
25 | permissions = "0500"; | 24 | permissions = "0500"; |
26 | } | 25 | }; |
27 | { | 26 | "webapps/diaspora/diaspora.yml" = { |
28 | dest = "webapps/diaspora/diaspora.yml"; | ||
29 | user = "diaspora"; | 27 | user = "diaspora"; |
30 | group = "diaspora"; | 28 | group = "diaspora"; |
31 | permissions = "0400"; | 29 | permissions = "0400"; |
@@ -102,9 +100,8 @@ in { | |||
102 | development: | 100 | development: |
103 | environment: | 101 | environment: |
104 | ''; | 102 | ''; |
105 | } | 103 | }; |
106 | { | 104 | "webapps/diaspora/database.yml" = { |
107 | dest = "webapps/diaspora/database.yml"; | ||
108 | user = "diaspora"; | 105 | user = "diaspora"; |
109 | group = "diaspora"; | 106 | group = "diaspora"; |
110 | permissions = "0400"; | 107 | permissions = "0400"; |
@@ -136,17 +133,16 @@ in { | |||
136 | <<: *combined | 133 | <<: *combined |
137 | database: diaspora_integration2 | 134 | database: diaspora_integration2 |
138 | ''; | 135 | ''; |
139 | } | 136 | }; |
140 | { | 137 | "webapps/diaspora/secret_token.rb" = { |
141 | dest = "webapps/diaspora/secret_token.rb"; | ||
142 | user = "diaspora"; | 138 | user = "diaspora"; |
143 | group = "diaspora"; | 139 | group = "diaspora"; |
144 | permissions = "0400"; | 140 | permissions = "0400"; |
145 | text = '' | 141 | text = '' |
146 | Diaspora::Application.config.secret_key_base = '${env.secret_token}' | 142 | Diaspora::Application.config.secret_key_base = '${env.secret_token}' |
147 | ''; | 143 | ''; |
148 | } | 144 | }; |
149 | ]; | 145 | }; |
150 | 146 | ||
151 | services.diaspora = { | 147 | services.diaspora = { |
152 | enable = true; | 148 | enable = true; |