speatzle/nfsense
1
0
Fork 0
mirror of https://github.com/speatzle/nfsense.git synced 2025-05-11 10:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move OverwriteFile to util

Browse source
This commit is contained in:
Samuel Lorch 2023-04-24 19:28:36 +02:00
parent 53598e5d78
commit 6f396b3833
2 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
internal/dhcp_server/apply.go
View file

@ -3,10 +3,10 @@ package dhcp
import ( import (
"context" "context"
"fmt" "fmt"
"os"
systemctl "github.com/coreos/go-systemd/v22/dbus" systemctl "github.com/coreos/go-systemd/v22/dbus"
"nfsense.net/nfsense/internal/definitions/config" "nfsense.net/nfsense/internal/definitions/config"
"nfsense.net/nfsense/internal/util"
) )
const dhcpv4File = "/etc/dhcp/dhcpd.conf" const dhcpv4File = "/etc/dhcp/dhcpd.conf"
@ -24,12 +24,12 @@ func ApplyDHCPServerConfiguration(currentConfig config.Config, pendingConfig con
return fmt.Errorf("Generating DHCPServerV6 Configuration: %w", err) return fmt.Errorf("Generating DHCPServerV6 Configuration: %w", err)
} }
err = OverwriteFile(dhcpv4File, v4Conf) err = util.OverwriteFile(dhcpv4File, v4Conf)
if err != nil { if err != nil {
return fmt.Errorf("Writing v4 Configuration: %w", err) return fmt.Errorf("Writing v4 Configuration: %w", err)
} }
err = OverwriteFile(dhcpv6File, v6Conf) err = util.OverwriteFile(dhcpv6File, v6Conf)
if err != nil { if err != nil {
return fmt.Errorf("Writing v6 Configuration: %w", err) return fmt.Errorf("Writing v6 Configuration: %w", err)
} }
@ -63,31 +63,3 @@ func ApplyDHCPServerConfiguration(currentConfig config.Config, pendingConfig con
} }
return nil return nil
} }
func OverwriteFile(path, content string) error {
f, err := os.OpenFile(path, os.O_RDWR, 0644)
if err != nil {
return fmt.Errorf("opening File: %w", err)
}
err = f.Truncate(0)
if err != nil {
return fmt.Errorf("truncate File: %w", err)
}
_, err = f.Seek(0, 0)
if err != nil {
return fmt.Errorf("seek File: %w", err)
}
_, err = f.WriteString(content + "\n")
if err != nil {
return fmt.Errorf("writing File: %w", err)
}
err = f.Sync()
if err != nil {
return fmt.Errorf("syncing File: %w", err)
}
return nil
}

34
internal/util/file.go Normal file
View file

@ -0,0 +1,34 @@
package util
import (
"fmt"
"os"
)
func OverwriteFile(path, content string) error {
f, err := os.OpenFile(path, os.O_RDWR, 0644)
if err != nil {
return fmt.Errorf("opening File: %w", err)
}
err = f.Truncate(0)
if err != nil {
return fmt.Errorf("truncate File: %w", err)
}
_, err = f.Seek(0, 0)
if err != nil {
return fmt.Errorf("seek File: %w", err)
}
_, err = f.WriteString(content + "\n")
if err != nil {
return fmt.Errorf("writing File: %w", err)
}
err = f.Sync()
if err != nil {
return fmt.Errorf("syncing File: %w", err)
}
return nil
}