aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-12-28 18:45:07 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-12-28 21:05:29 +0200
commit7fdaf37317ef22a9f9828f0a4859545f21512aa1 (patch)
tree85e12c1e0617bdd920c6852261c1eed787c70e22
parent2b33f33982bb82024f8874244ca1d8448f08a74b (diff)
downloaddmvpn-tools-7fdaf37317ef22a9f9828f0a4859545f21512aa1.tar.bz2
dmvpn-tools-7fdaf37317ef22a9f9828f0a4859545f21512aa1.tar.xz
adjust default paths
-rwxr-xr-xdmvpn-ca4
-rw-r--r--dmvpn-ca.conf (renamed from config.yaml)0
2 files changed, 2 insertions, 2 deletions
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/config.yaml b/dmvpn-ca.conf
index d1c95cc..d1c95cc 100644
--- a/config.yaml
+++ b/dmvpn-ca.conf