From b33078fa33441c33c5d018b1b9a248c646549842 Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
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
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 0bca5df1df..2cbc7ccfa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ _testmain.go
 
 coverage.out
 
+/modules/options/bindata.go
 /modules/public/bindata.go
 /modules/templates/bindata.go
 
-- 
cgit v1.2.3