From b33078fa33441c33c5d018b1b9a248c646549842 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Thu, 22 Dec 2016 19:12:23 +0100 Subject: Bindata is optional and over-writable on restart (#354) * Moved conf assets into options folder * Dropped old bindata * Started to integrate options bindata and accessors * Do not enforce a builtin app.ini * Replaced bindata calls with options * Dropped bindata task from makefile, it's the generate task now * Always embedd app.ini to provide sane config defaults * Use sane defaults for the configuration * Defined default value for SSH_KEYGEN_PATH * Dropped "NEVER EVER MODIFY THIS FILE" header from app.ini * Fixed new paths in latest test additions * Drop bindata with make clean task * Set more proper default values --- modules/base/tool_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/base') diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go index 9c4fb89e8e..bda2e65a19 100644 --- a/modules/base/tool_test.go +++ b/modules/base/tool_test.go @@ -25,7 +25,7 @@ const ( func TestMain(m *testing.M) { // setup macaroni18n.I18n(macaroni18n.Options{ - Directory: "../../conf/locale/", + Directory: "../../options/locale/", DefaultLang: "en-US", Langs: []string{"en-US"}, Names: []string{"english"}, -- cgit v1.2.3