From 7fdaf37317ef22a9f9828f0a4859545f21512aa1 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Thu, 28 Dec 2017 18:45:07 +0200
Subject: adjust default paths

---
 config.yaml   | 17 -----------------
 dmvpn-ca      |  4 ++--
 dmvpn-ca.conf | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 config.yaml
 create mode 100644 dmvpn-ca.conf

diff --git a/config.yaml b/config.yaml
deleted file mode 100644
index d1c95cc..0000000
--- a/config.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-cert:
-  lifetime: 600
-
-ca:
-  dn: 'DC=com,DC=example'
-  lifetime: 3600
-  key:
-    curve: secp521r1
-
-hub:
-  subnets:
-  - '10.0.0.0/8'
-  - '172.16.0.0/16'
-  - 'fd06:f00d:cafe::/64'
-
-crl:
-  dist-point: 'http://example.com/dmvpn-ca.crl'
diff --git a/dmvpn-ca b/dmvpn-ca
index 5cc6a8d..7e0a57d 100755
--- a/dmvpn-ca
+++ b/dmvpn-ca
@@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]--
 
-conf_file = io.open('config.yaml')
+conf_file = io.open(os.getenv('DMVPN_CA_CONF') or '/etc/dmvpn-ca.conf')
 config = require('lyaml').load(conf_file:read('*a'))
 conf_file:close()
 
@@ -69,7 +69,7 @@ end
 set_config_defaults(
 	config,
 	{
-		['db-file']='dmvpn-ca.sqlite3',
+		['db-file']='/var/lib/misc/dmvpn-ca.sqlite3',
 		cert={
 			lifetime=365 * 24 * 60 * 60,
 			['hash-alg']='SHA256',
diff --git a/dmvpn-ca.conf b/dmvpn-ca.conf
new file mode 100644
index 0000000..d1c95cc
--- /dev/null
+++ b/dmvpn-ca.conf
@@ -0,0 +1,17 @@
+cert:
+  lifetime: 600
+
+ca:
+  dn: 'DC=com,DC=example'
+  lifetime: 3600
+  key:
+    curve: secp521r1
+
+hub:
+  subnets:
+  - '10.0.0.0/8'
+  - '172.16.0.0/16'
+  - 'fd06:f00d:cafe::/64'
+
+crl:
+  dist-point: 'http://example.com/dmvpn-ca.crl'
-- 
cgit v1.2.3