EnumDev/enit
1
0
Fork 0
mirror of https://github.com/EnumeratedDev/enit.git synced 2026-09-16 02:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

esvm: move enabled services to enabled-services.yml file

Browse Source
This commit is contained in:
EnumDev
2025-12-08 15:19:57 +02:00
parent 06f5e6564f
commit fa17840ad5
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ectl/utils.go
+4 -4
View File
@@ -48,7 +48,7 @@ func setServiceEnabled(service string, stage int) error {
if err != nil { if err != nil {
return err return err
} }
err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled_services"), data, 0644) err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled-services.yml"), data, 0644)
if err != nil { if err != nil {
return err return err
} }
@@ -59,7 +59,7 @@ func setServiceEnabled(service string, stage int) error {
func readEnabledServices() (EnabledServices map[int][]string) { func readEnabledServices() (EnabledServices map[int][]string) {
EnabledServices = make(map[int][]string) EnabledServices = make(map[int][]string)
data, err := os.ReadFile(path.Join(sysconfdir, "esvm/enabled_services")) data, err := os.ReadFile(path.Join(sysconfdir, "esvm/enabled-services.yml"))
if err != nil { if err != nil {
return EnabledServices return EnabledServices
} }
@@ -71,12 +71,12 @@ func readEnabledServices() (EnabledServices map[int][]string) {
EnabledServices[3] = append(EnabledServices[3], service) EnabledServices[3] = append(EnabledServices[3], service)
} }
// Update enabled_services file // Update enabled-services.yml file
data, err := yaml.Marshal(EnabledServices) data, err := yaml.Marshal(EnabledServices)
if err != nil { if err != nil {
return EnabledServices return EnabledServices
} }
err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled_services"), data, 0644) err = os.WriteFile(path.Join(sysconfdir, "esvm/enabled-services.yml"), data, 0644)
if err != nil { if err != nil {
return EnabledServices return EnabledServices
} }
src/esvm/service.go
+1 -16
View File
@@ -514,30 +514,15 @@ func (service *EnitService) RestartService() error {
func ReadEnabledServices() (EnabledServices map[int][]string) { func ReadEnabledServices() (EnabledServices map[int][]string) {
EnabledServices = make(map[int][]string) EnabledServices = make(map[int][]string)
data, err := os.ReadFile(path.Join(serviceConfigDir, "enabled_services")) data, err := os.ReadFile(path.Join(serviceConfigDir, "enabled-services.yml"))
if err != nil { if err != nil {
return EnabledServices return EnabledServices
} }
err = yaml.Unmarshal(data, &EnabledServices) err = yaml.Unmarshal(data, &EnabledServices)
if err != nil {
// Assume old plain text format
for _, service := range strings.Split(strings.TrimSpace(string(data)), "\n") {
EnabledServices[3] = append(EnabledServices[3], service)
}
// Update enabled_services file
data, err := yaml.Marshal(EnabledServices)
if err != nil {
return EnabledServices
}
err = os.WriteFile(path.Join(serviceConfigDir, "enabled_services"), data, 0644)
if err != nil { if err != nil {
return EnabledServices return EnabledServices
} }
return EnabledServices return EnabledServices
} }
return EnabledServices
}