f-28: fix: debug somme minor errors
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
b41b4f2518
commit
732a293857
3 changed files with 14 additions and 9 deletions
|
|
@ -2,12 +2,8 @@
|
|||
users:
|
||||
- name: syonad
|
||||
lock_passwd: false
|
||||
gecos: alpine Cloud User
|
||||
groups: [adm, wheel]
|
||||
doas:
|
||||
- permit nopass syonad
|
||||
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
||||
shell: /bin/ash
|
||||
shell: /bin/bash
|
||||
passwd: "{{ .Password }}"
|
||||
ssh_authorized_keys:
|
||||
- "{{ .SSHKEY }}"
|
||||
|
|
@ -15,7 +15,13 @@ func GetDefaultGateway() (net.IP, error) {
|
|||
return nil, fmt.Errorf("list routes: %w", err)
|
||||
}
|
||||
for _, r := range routes {
|
||||
if r.Dst == nil && r.Gw != nil {
|
||||
if r.Gw == nil {
|
||||
continue
|
||||
}
|
||||
if r.Dst == nil {
|
||||
return r.Gw, nil
|
||||
}
|
||||
if ones, _ := r.Dst.Mask.Size(); ones == 0 {
|
||||
return r.Gw, nil
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,8 +54,11 @@ func stopDHCP(db *badger.DB, subnetName string, d subnetData) error {
|
|||
}
|
||||
defer svc.Close()
|
||||
|
||||
if err := svc.Stop("dnsmasq@" + d.vpc + "_" + d.bridge + ".service"); err != nil {
|
||||
return fmt.Errorf("stop dnsmasq: %w", err)
|
||||
svcName := "dnsmasq@" + d.vpc + "_" + d.bridge + ".service"
|
||||
if status, err := svc.Status(svcName); err == nil && status.ActiveState == "active" {
|
||||
if err := svc.Stop(svcName); err != nil {
|
||||
return fmt.Errorf("stop dnsmasq: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := os.Remove("/etc/dnsmasq.d/" + d.vpc + "_" + d.bridge + ".conf"); err != nil && !os.IsNotExist(err) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue