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 --- conf/gitignore/Vagrant | 1 - 1 file changed, 1 deletion(-) delete mode 100644 conf/gitignore/Vagrant (limited to 'conf/gitignore/Vagrant') diff --git a/conf/gitignore/Vagrant b/conf/gitignore/Vagrant deleted file mode 100644 index a977916f65..0000000000 --- a/conf/gitignore/Vagrant +++ /dev/null @@ -1 +0,0 @@ -.vagrant/ -- cgit v1.2.3