Merge branch 'master' into nginx

2019-10-27 22:16:54 +01:00 · 2019-10-27 22:16:54 +01:00 · 96b3f1b342
parent 7864d5b6a2 19f825dba4
commit 96b3f1b342
2 changed files with 1 additions and 6 deletions
--- a/shard.yml
+++ b/shard.yml
@ -7,12 +7,6 @@ authors:
 description: |
  Services management tool.

-targets:
-  service:
-    main: src/service.cr
-  status:
-    main: src/status.cr
-
 dependencies:
  specparser:
    git: https://git.karchnu.fr/WeirdOS/recipes-parser
--- a/src/gen-config.cr
+++ b/src/gen-config.cr
@ -48,6 +48,7 @@ class GenConfig::Context
 	end

 	def generate(template, target : String, options : Hash(String, Variables))
+		Environment.load ENVIRONMENTS_DIRECTORY
 		ServiceDefinition.load SERVICES_DIRECTORY
 		Service.load RC_DIRECTORY
 		Environment.load ENVIRONMENTS_DIRECTORY