- FileOwnership option to Ownership
- FilePermissions option to Permissions
This commit is contained in:
Quentin McGaw (desktop)
2020-02-08 15:29:27 +00:00
parent 1f873e7d66
commit 6620ba52d2
8 changed files with 18 additions and 16 deletions

View File

@@ -24,8 +24,8 @@ func (c *configurator) MakeUnboundConf(settings settings.DNS, uid, gid int) (err
return c.fileManager.WriteLinesToFile(
string(constants.UnboundConf),
lines,
files.FileOwnership(uid, gid),
files.FilePermissions(0400))
files.Ownership(uid, gid),
files.Permissions(0400))
}
// MakeUnboundConf generates an Unbound configuration from the user provided settings

View File

@@ -18,8 +18,8 @@ func (c *configurator) DownloadRootHints(uid, gid int) error {
return c.fileManager.WriteToFile(
string(constants.RootHints),
content,
files.FileOwnership(uid, gid),
files.FilePermissions(0400))
files.Ownership(uid, gid),
files.Permissions(0400))
}
func (c *configurator) DownloadRootKey(uid, gid int) error {
@@ -33,6 +33,6 @@ func (c *configurator) DownloadRootKey(uid, gid int) error {
return c.fileManager.WriteToFile(
string(constants.RootKey),
content,
files.FileOwnership(uid, gid),
files.FilePermissions(0400))
files.Ownership(uid, gid),
files.Permissions(0400))
}

View File

@@ -18,6 +18,6 @@ func (c *configurator) WriteAuthFile(user, password string, uid, gid int) error
return c.fileManager.WriteLinesToFile(
string(constants.OpenVPNAuthConf),
[]string{user, password},
files.FileOwnership(uid, gid),
files.FilePermissions(0400))
files.Ownership(uid, gid),
files.Permissions(0400))
}

View File

@@ -81,6 +81,6 @@ func (c *configurator) BuildConf(region models.PIARegion, protocol models.Networ
"</ca>",
"",
}...)
err = c.fileManager.WriteLinesToFile(string(constants.OpenVPNConf), lines, files.FileOwnership(uid, gid), files.FilePermissions(0400))
err = c.fileManager.WriteLinesToFile(string(constants.OpenVPNConf), lines, files.Ownership(uid, gid), files.Permissions(0400))
return IPs, port, err
}

View File

@@ -14,8 +14,8 @@ func (c *configurator) MakeConf(port uint16, password string, uid, gid int) (err
return c.fileManager.WriteToFile(
string(constants.ShadowsocksConf),
data,
files.FileOwnership(uid, gid),
files.FilePermissions(0400))
files.Ownership(uid, gid),
files.Permissions(0400))
}
func generateConf(port uint16, password string) (data []byte) {

View File

@@ -14,8 +14,8 @@ func (c *configurator) MakeConf(logLevel models.TinyProxyLogLevel, port uint16,
lines := generateConf(logLevel, port, user, password)
return c.fileManager.WriteLinesToFile(string(constants.TinyProxyConf),
lines,
files.FileOwnership(uid, gid),
files.FilePermissions(0400))
files.Ownership(uid, gid),
files.Permissions(0400))
}
func generateConf(logLevel models.TinyProxyLogLevel, port uint16, user, password string) (lines []string) {