From 8d7e12d3fbef4230613848a219cf0168d90a9993 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 20 Mar 2019 01:01:48 -0600
Subject: conf: expose configuration root directory

---
 conf/store.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'conf/store.go')

diff --git a/conf/store.go b/conf/store.go
index da144a17..43f524cd 100644
--- a/conf/store.go
+++ b/conf/store.go
@@ -18,7 +18,7 @@ const configFileSuffix = ".conf.dpapi"
 const configFileUnencryptedSuffix = ".conf"
 
 func ListConfigNames() ([]string, error) {
-	configFileDir, err := resolveConfigFileDir()
+	configFileDir, err := tunnelConfigurationsDirectory()
 	if err != nil {
 		return nil, err
 	}
@@ -47,7 +47,7 @@ func ListConfigNames() ([]string, error) {
 }
 
 func MigrateUnencryptedConfigs() (int, []error) {
-	configFileDir, err := resolveConfigFileDir()
+	configFileDir, err := tunnelConfigurationsDirectory()
 	if err != nil {
 		return 0, []error{err}
 	}
@@ -120,7 +120,7 @@ func MigrateUnencryptedConfigs() (int, []error) {
 }
 
 func LoadFromName(name string) (*Config, error) {
-	configFileDir, err := resolveConfigFileDir()
+	configFileDir, err := tunnelConfigurationsDirectory()
 	if err != nil {
 		return nil, err
 	}
@@ -166,7 +166,7 @@ func (config *Config) Save() error {
 	if !TunnelNameIsValid(config.Name) {
 		return errors.New("Tunnel name is not valid")
 	}
-	configFileDir, err := resolveConfigFileDir()
+	configFileDir, err := tunnelConfigurationsDirectory()
 	if err != nil {
 		return err
 	}
@@ -192,7 +192,7 @@ func (config *Config) Path() (string, error) {
 	if !TunnelNameIsValid(config.Name) {
 		return "", errors.New("Tunnel name is not valid")
 	}
-	configFileDir, err := resolveConfigFileDir()
+	configFileDir, err := tunnelConfigurationsDirectory()
 	if err != nil {
 		return "", err
 	}
@@ -203,7 +203,7 @@ func DeleteName(name string) error {
 	if !TunnelNameIsValid(name) {
 		return errors.New("Tunnel name is not valid")
 	}
-	configFileDir, err := resolveConfigFileDir()
+	configFileDir, err := tunnelConfigurationsDirectory()
 	if err != nil {
 		return err
 	}
-- 
cgit v1.2.3-59-g8ed1b