git.iko.soy/typeable/nixpkgs
on master help sign in
quoting stateDir path in case it includes spaces
commit975f476cd27c6a8a3ea11aac746396573845b091 authorAaron Andersen <aaron@fosslib.net> dateThu 11 Oct 2018, 08:04 (8 years ago) parent72635ba
1 file changed+21−21
nixos/modules/services/misc/redmine.nix+21−21
nixos/modules/services/misc/redmine.nix+21−21
@@ -225,68 +225,68 @@ in
225225 ];
226226 preStart = ''
227227 # ensure cache directory exists for db:migrate command
228− mkdir -p ${cfg.stateDir}/cache
228+ mkdir -p "${cfg.stateDir}/cache"
229229
230230 # create the basic directory layout the redmine package expects
231231 mkdir -p /run/redmine/public
232232
233233 for i in config files log plugins tmp; do
234− mkdir -p ${cfg.stateDir}/$i
235− ln -fs ${cfg.stateDir}/$i /run/redmine/
234+ mkdir -p "${cfg.stateDir}/$i"
235+ ln -fs "${cfg.stateDir}/$i" /run/redmine/
236236 done
237237
238238 for i in plugin_assets themes; do
239− mkdir -p ${cfg.stateDir}/public/$i
240− ln -fs ${cfg.stateDir}/public/$i /run/redmine/public/
239+ mkdir -p "${cfg.stateDir}/public/$i"
240+ ln -fs "${cfg.stateDir}/public/$i" /run/redmine/public/
241241 done
242242
243243
244244 # start with a fresh config directory
245245 # the config directory is copied instead of linked as some mutable data is stored in there
246− rm -rf ${cfg.stateDir}/config/*
247− cp -r ${cfg.package}/share/redmine/config.dist/* ${cfg.stateDir}/config/
246+ rm -rf "${cfg.stateDir}/config/"*
247+ cp -r ${cfg.package}/share/redmine/config.dist/* "${cfg.stateDir}/config/"
248248
249249 # link in the application configuration
250− ln -fs ${configurationYml} ${cfg.stateDir}/config/configuration.yml
250+ ln -fs ${configurationYml} "${cfg.stateDir}/config/configuration.yml"
251251
252252
253253 # link in all user specified themes
254− rm -rf ${cfg.stateDir}/public/themes/*
254+ rm -rf "${cfg.stateDir}/public/themes/"*
255255 for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do
256− ln -fs $theme/* ${cfg.stateDir}/public/themes/
256+ ln -fs $theme/* "${cfg.stateDir}/public/themes"
257257 done
258258
259259 # link in redmine provided themes
260− ln -sf ${cfg.package}/share/redmine/public/themes.dist/* ${cfg.stateDir}/public/themes/
260+ ln -sf ${cfg.package}/share/redmine/public/themes.dist/* "${cfg.stateDir}/public/themes/"
261261
262262
263263 # link in all user specified plugins
264− rm -rf ${cfg.stateDir}/plugins/*
264+ rm -rf "${cfg.stateDir}/plugins/"*
265265 for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do
266− ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-}
266+ ln -fs $plugin/* "${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-}"
267267 done
268268
269269
270270 # ensure correct permissions for most files
271− chmod -R ug+rwX,o-rwx+x ${cfg.stateDir}/
271+ chmod -R ug+rwX,o-rwx+x "${cfg.stateDir}/"
272272
273273
274274 # handle database.passwordFile & permissions
275275 DBPASS=$(head -n1 ${cfg.database.passwordFile})
276− cp -f ${databaseYml} ${cfg.stateDir}/config/database.yml
277− sed -e "s,#dbpass#,$DBPASS,g" -i ${cfg.stateDir}/config/database.yml
278− chmod 440 ${cfg.stateDir}/config/database.yml
276+ cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml"
277+ sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml"
278+ chmod 440 "${cfg.stateDir}/config/database.yml"
279279
280280
281281 # generate a secret token if required
282282 if ! test -e "${cfg.stateDir}/config/initializers/secret_token.rb"; then
283283 ${bundle} exec rake generate_secret_token
284− chmod 440 ${cfg.stateDir}/config/initializers/secret_token.rb
284+ chmod 440 "${cfg.stateDir}/config/initializers/secret_token.rb"
285285 fi
286286
287287
288288 # ensure everything is owned by ${cfg.user}
289− chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
289+ chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}"
290290
291291
292292 # execute redmine required commands prior to starting the application
@@ -297,7 +297,7 @@ in
297297
298298 # log files don't exist until after first command has been executed
299299 # correct ownership of files generated by calling exec rake ...
300− chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}/log
300+ chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}/log"
301301 '';
302302
303303 serviceConfig = {
@@ -307,7 +307,7 @@ in
307307 Group = cfg.group;
308308 TimeoutSec = "300";
309309 WorkingDirectory = "${cfg.package}/share/redmine";
310− ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P ${cfg.stateDir}/redmine.pid";
310+ ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'";
311311 };
312312
313313 };