extend dhcp checks #272

#272 do not sync dhcp if empty IP
Fix config issues with new env library (#273 )
2024-01-14 16:13:45 +01:00 · 2024-01-14 14:03:04 +01:00 · 2024-01-14 13:29:36 +01:00 · 2024-01-14 09:07:54 +01:00 · 2024-01-10 20:12:08 +01:00 · 2024-01-08 19:39:47 +01:00
47 changed files with 2765 additions and 1292 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -37,6 +37,13 @@ body:
      render: shell
    validations:
      required: true
+  - type: textarea
+    id: applied-config
+    attributes:
+      label: Current Applied Configuration
+      description: |
+        - Run adguardhome-sync with environment variable `PRINT_CONFIG_ONLY=true` and provide the output here
+      render: shell
  - type: textarea
    id: logs
    attributes:
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -11,6 +11,11 @@ on:
 jobs:
  e2e:
    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        build:
+          - mode: env
+          - mode: file
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -22,7 +27,7 @@ jobs:
        run: ./testdata/e2e/bin/build-image.sh

      - name: Install Helm Chart
-        run: ./testdata/e2e/bin/install-chart.sh
+        run: ./testdata/e2e/bin/install-chart.sh ${{ matrix.build.mode }}
      - name: Wait for sync to finish
        run: ./testdata/e2e/bin/wait-for-sync.sh
      - name: Show origin Logs
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,5 @@ main
 .adguardhome-sync.yaml
 tmp
 bin
-config.yaml
+config*.yaml
 *.log
--- a/8
+++ b/8
@@ -22,6 +22,7 @@ test-ci: mocks tidy

 mocks: mockgen
 	$(MOCKGEN) -package client -destination pkg/mocks/client/mock.go github.com/bakito/adguardhome-sync/pkg/client Client
+	$(MOCKGEN) -package client -destination pkg/mocks/flags/mock.go github.com/bakito/adguardhome-sync/pkg/config Flags

 release: semver goreleaser
 	@version=$$($(LOCALBIN)/semver); \
@@ -52,8 +53,8 @@ SEMVER_VERSION ?= v1.1.3
 OAPI_CODEGEN_VERSION ?= v2.0.0
 MOCKGEN_VERSION ?= v1.6.0
 GOLANGCI_LINT_VERSION ?= v1.55.2
-GORELEASER_VERSION ?= v1.22.1
-DEEPCOPY_GEN_VERSION ?= v0.28.4
+GORELEASER_VERSION ?= v1.23.0
+DEEPCOPY_GEN_VERSION ?= v0.29.0

 ## Tool Installer
 .PHONY: semver
@@ -104,6 +105,9 @@ start-replica:
 	docker run --pull always --name adguardhome-replica -p 9091:3000 --rm adguard/adguardhome:latest
 #	docker run --pull always --name adguardhome-replica -p 9090:80 -p 9091:3000 --rm adguard/adguardhome:v0.107.13

+copy-replica-config:
+	docker cp adguardhome-replica:/opt/adguardhome/conf/AdGuardHome.yaml tmp/AdGuardHome.yaml
+
 start-replica2:
 	docker run --pull always --name adguardhome-replica2 -p 9093:3000 --rm adguard/adguardhome:latest
 #	docker run --pull always --name adguardhome-replica -p 9090:80 -p 9091:3000 --rm adguard/adguardhome:v0.107.13
--- a/README.md
+++ b/README.md
@@ -10,6 +10,35 @@ Synchronize [AdGuardHome](https://github.com/AdguardTeam/AdGuardHome) config to

 Please check the wiki for [FAQ](https://github.com/bakito/adguardhome-sync/wiki/FAQ).

+## Deprecation of Environment Variables as of v0.6.0
+
+The following environment variables have been deprecated and replaced with better readable ones:
+Deprecated variables are still supported but will be logged as warning.
+| Deprecated | Replacement |
+| :----------- |:----------- |
+| RUNONSTART | RUN_ON_START |
+| PRINTCONFIGONLY | PRINT_CONFIG_ONLY |
+| CONTINUE_ON_ERROR | CONTINUE_ON_ERROR |
+| API_DARKMODE | API_DARK_MODE |
+| FEATURES_DHCP_SERVERCONFIG | FEATURES_DHCP_SERVER_CONFIG |
+| FEATURES_DHCP_STATICLEASES | FEATURES_DHCP_STATIC_LEASES |
+| FEATURES_DNS_ACCESSLISTS | FEATURES_DNS_ACCESS_LISTS |
+| FEATURES_DNS_SERVERCONFIG | FEATURES_DNS_SERVER_CONFIG |
+| FEATURES_GENERALSETTINGS | FEATURES_GENERAL_SETTINGS |
+| FEATURES_QUERYLOGCONFIG | FEATURES_QUERY_LOG_CONFIG |
+| FEATURES_STATSCONFIG | FEATURES_STATS_CONFIG |
+| FEATURES_CLIENTSETTINGS | FEATURES_CLIENT_SETTINGS |
+| ORIGIN_WEBURL | ORIGIN_WEB_URL |
+| ORIGIN_APIPATH | ORIGIN_API_PATH |
+| ORIGIN_INSECURE_SKIP_VERIFY | ORIGIN_INSECURE_SKIP_VERIFY |
+| *REPLICA_WEBURL | REPLICA_WEB_URL |
+| *REPLICA_APIPATH | REPLICA_API_PATH |
+| *REPLICA_INSECURE_SKIP_VERIFY | REPLICA_INSECURE_SKIP_VERIFY |
+| *REPLICA_AUTOSETUP | REPLICA_AUTO_SETUP |
+| *REPLICA_INTERFACENAME | REPLICA_INTERFACE_NAME |
+
+\* is also valid for numbered `REPLICA#_` variables
+
 ## Current sync features

 - General Settings
@@ -146,6 +175,8 @@ services:
    environment:
      LOG_LEVEL: "info"
      ORIGIN_URL: "https://192.168.1.2:3000"
+      # ORIGIN_WEB_URL: "https://some-other.url" # used in the web interface (default: <origin-url>
+
      ORIGIN_USERNAME: "username"
      ORIGIN_PASSWORD: "password"
      REPLICA_URL: "http://192.168.1.3"
@@ -154,27 +185,29 @@ services:
      REPLICA1_URL: "http://192.168.1.4"
      REPLICA1_USERNAME: "username"
      REPLICA1_PASSWORD: "password"
-      REPLICA1_APIPATH: "/some/path/control"
-      # REPLICA1_AUTOSETUP: true # if true, AdGuardHome is automatically initialized.
-      # REPLICA1_INTERFACENAME: 'ens18' # use custom dhcp interface name
-      # REPLICA1_DHCPSERVERENABLED: true/false (optional) enables/disables the dhcp server on the replica
+      REPLICA1_API_PATH: "/some/path/control"
+      # REPLICA1_WEB_URL: "https://some-other.url" # used in the web interface (default: <replica-url>
+      # REPLICA1_AUTO_SETUP: true # if true, AdGuardHome is automatically initialized.
+      # REPLICA1_INTERFACE_NAME: 'ens18' # use custom dhcp interface name
+      # REPLICA1_DHCP_SERVER_ENABLED: true/false (optional) enables/disables the dhcp server on the replica
      CRON: "*/10 * * * *" # run every 10 minutes
      RUNONSTART: true
+      # CONTINUE_ON_ERROR: false # If enabled, the synchronisation task will not fail on single errors, but will log the errors and continue

      # Configure the sync API server, disabled if api port is 0
      API_PORT: 8080

      # Configure sync features; by default all features are enabled.
-      # FEATURES_GENERALSETTINGS: true
-      # FEATURES_QUERYLOGCONFIG: true
-      # FEATURES_STATSCONFIG: true
-      # FEATURES_CLIENTSETTINGS: true
+      # FEATURES_GENERAL_SETTINGS: true
+      # FEATURES_QUERY_LOG_CONFIG: true
+      # FEATURES_STATS_CONFIG: true
+      # FEATURES_CLIENT_SETTINGS: true
      # FEATURES_SERVICES: true
      # FEATURES_FILTERS: true
-      # FEATURES_DHCP_SERVERCONFIG: true
-      # FEATURES_DHCP_STATICLEASES: true
-      # FEATURES_DNS_SERVERCONFIG: true
-      # FEATURES_DNS_ACCESSLISTS: true
+      # FEATURES_DHCP_SERVER_CONFIG: true
+      # FEATURES_DHCP_STATIC_LEASES: true
+      # FEATURES_DNS_SERVER_CONFIG: true
+      # FEATURES_DNS_ACCESS_LISTS: true
      # FEATURES_DNS_REWRITES: true
    ports:
      - 8080:8080
@@ -192,6 +225,9 @@ cron: "*/10 * * * *"
 # runs the synchronisation on startup
 runOnStart: true

+# If enabled, the synchronisation task will not fail on single errors, but will log the errors and continue
+continueOnError: false
+
 origin:
  # url of the origin instance
  url: https://192.168.1.2:3000
@@ -201,15 +237,7 @@ origin:
  password: password
  # cookie: Origin-Cookie-Name=CCCOOOKKKIIIEEE

-# replica instance (optional, if only one)
-replica:
-  # url of the replica instance
-  url: http://192.168.1.3
-  username: username
-  password: password
-  # cookie: Replica-Cookie-Name=CCCOOOKKKIIIEEE
-
-# replicas instances (optional, if more than one)
+# replicas instances
 replicas:
  # url of the replica instance
  - url: http://192.168.1.3
@@ -221,6 +249,7 @@ replicas:
    password: password
    # cookie: Replica2-Cookie-Name=CCCOOOKKKIIIEEE
    # autoSetup: true # if true, AdGuardHome is automatically initialized.
+    # webURL: "https://some-other.url" # used in the web interface (default: <replica-url>

 # Configure the sync API server, disabled if api port is 0
 api:
@@ -229,6 +258,8 @@ api:
  # if username and password are defined, basic auth is applied to the sync API
  username: username
  password: password
+  # enable api dark mode
+  darkMode: true

 # Configure sync features; by default all features are enabled.
 features:
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -3,72 +3,15 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"regexp"
-	"strings"

 	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/types"
 	"github.com/bakito/adguardhome-sync/version"
-	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"go.uber.org/zap"
-)
-
-const (
-	configCron            = "cron"
-	configRunOnStart      = "runOnStart"
-	configPrintConfigOnly = "printConfigOnly"
-
-	configAPIPort     = "api.port"
-	configAPIUsername = "api.username"
-	configAPIPassword = "api.password"
-	configAPIDarkMode = "api.darkMode"
-
-	configFeatureDHCPServerConfig = "features.dhcp.serverConfig"
-	configFeatureDHCPStaticLeases = "features.dhcp.staticLeases"
-	configFeatureDNServerConfig   = "features.dns.serverConfig"
-	configFeatureDNSPAccessLists  = "features.dns.accessLists"
-	configFeatureDNSRewrites      = "features.dns.rewrites"
-	configFeatureGeneralSettings  = "features.generalSettings"
-	configFeatureQueryLogConfig   = "features.queryLogConfig"
-	configFeatureStatsConfig      = "features.statsConfig"
-	configFeatureClientSettings   = "features.clientSettings"
-	configFeatureServices         = "features.services"
-	configFeatureFilters          = "features.filters"
-
-	configOriginURL                = "origin.url"
-	configOriginAPIPath            = "origin.apiPath"
-	configOriginUsername           = "origin.username"
-	configOriginPassword           = "origin.password"
-	configOriginCookie             = "origin.cookie"
-	configOriginInsecureSkipVerify = "origin.insecureSkipVerify"
-
-	configReplicaURL                = "replica.url"
-	configReplicaAPIPath            = "replica.apiPath"
-	configReplicaUsername           = "replica.username"
-	configReplicaPassword           = "replica.password"
-	configReplicaCookie             = "replica.cookie"
-	configReplicaInsecureSkipVerify = "replica.insecureSkipVerify"
-	configReplicaAutoSetup          = "replica.autoSetup"
-	configReplicaInterfaceName      = "replica.interfaceName"
-
-	envReplicasUsernameFormat           = "REPLICA%s_USERNAME" // #nosec G101
-	envReplicasPasswordFormat           = "REPLICA%s_PASSWORD" // #nosec G101
-	envReplicasCookieFormat             = "REPLICA%s_COOKIE"   // #nosec G101
-	envReplicasAPIPathFormat            = "REPLICA%s_APIPATH"
-	envReplicasInsecureSkipVerifyFormat = "REPLICA%s_INSECURESKIPVERIFY"
-	envReplicasAutoSetup                = "REPLICA%s_AUTOSETUP"
-	envReplicasInterfaceName            = "REPLICA%s_INTERFACENAME"
-	// Deprecated: use envReplicasInterfaceName instead
-	envReplicasInterfaceNameDeprecated = "REPLICA%s_INTERFACWENAME"
-	envDHCPServerEnabled               = "REPLICA%s_DHCPSERVERENABLED"
 )

 var (
-	cfgFile               string
-	logger                = log.GetLogger("root")
-	envReplicasURLPattern = regexp.MustCompile(`^REPLICA(\d+)_URL=(.*)`)
+	cfgFile string
+	logger  = log.GetLogger("root")
 )

 // rootCmd represents the base command when called without any subcommands
@@ -88,8 +31,6 @@ func Execute() {
 }

 func init() {
-	cobra.OnInitialize(initConfig)
-
 	// Here you will define your flags and configuration settings.
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.
@@ -100,95 +41,3 @@ func init() {
 	// when this action is called directly.
 	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
-
-// initConfig reads in config file and ENV variables if set.
-func initConfig() {
-	if cfgFile != "" {
-		// Use config file from the flag.
-		viper.SetConfigFile(cfgFile)
-	} else {
-		// Find home directory.
-		home, err := homedir.Dir()
-		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		// Search config in home directory with name ".adguardhome-sync" (without extension).
-		viper.AddConfigPath(home)
-		viper.SetConfigName(".adguardhome-sync")
-	}
-	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_"))
-	viper.AutomaticEnv() // read in environment variables that match
-
-	// If a config file is found, read it in.
-	if err := viper.ReadInConfig(); err == nil {
-		logger.Info("Using config file:", viper.ConfigFileUsed())
-	} else if cfgFile != "" {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}
-
-func getConfig(logger *zap.SugaredLogger) (*types.Config, error) {
-	cfg := &types.Config{}
-	if err := viper.Unmarshal(cfg); err != nil {
-		return nil, err
-	}
-	if cfg.Replica != nil &&
-		cfg.Replica.URL == "" &&
-		cfg.Replica.Username == "" {
-		cfg.Replica = nil
-	}
-
-	if len(cfg.Replicas) == 0 {
-		cfg.Replicas = append(cfg.Replicas, collectEnvReplicas(logger)...)
-	}
-	return cfg, nil
-}
-
-// Manually collect replicas from env.
-func collectEnvReplicas(logger *zap.SugaredLogger) []types.AdGuardInstance {
-	var replicas []types.AdGuardInstance
-	for _, v := range os.Environ() {
-		if envReplicasURLPattern.MatchString(v) {
-			sm := envReplicasURLPattern.FindStringSubmatch(v)
-			re := types.AdGuardInstance{
-				URL:                sm[2],
-				Username:           os.Getenv(fmt.Sprintf(envReplicasUsernameFormat, sm[1])),
-				Password:           os.Getenv(fmt.Sprintf(envReplicasPasswordFormat, sm[1])),
-				Cookie:             os.Getenv(fmt.Sprintf(envReplicasCookieFormat, sm[1])),
-				APIPath:            os.Getenv(fmt.Sprintf(envReplicasAPIPathFormat, sm[1])),
-				InsecureSkipVerify: strings.EqualFold(os.Getenv(fmt.Sprintf(envReplicasInsecureSkipVerifyFormat, sm[1])), "true"),
-				AutoSetup:          strings.EqualFold(os.Getenv(fmt.Sprintf(envReplicasAutoSetup, sm[1])), "true"),
-				InterfaceName:      os.Getenv(fmt.Sprintf(envReplicasInterfaceName, sm[1])),
-			}
-
-			if re.InterfaceName == "" {
-				if in, ok := os.LookupEnv(fmt.Sprintf(envReplicasInterfaceNameDeprecated, sm[1])); ok {
-					logger.
-						With("correct", envReplicasInterfaceName, "deprecated", envReplicasInterfaceNameDeprecated).
-						Warn("Deprecated env variable is used, please use the correct one")
-					re.InterfaceName = in
-				}
-			}
-			if dhcpEnabled, ok := os.LookupEnv(fmt.Sprintf(envDHCPServerEnabled, sm[1])); ok {
-				if strings.EqualFold(dhcpEnabled, "true") {
-					re.DHCPServerEnabled = boolPtr(true)
-				} else if strings.EqualFold(dhcpEnabled, "false") {
-					re.DHCPServerEnabled = boolPtr(false)
-				}
-			}
-			if re.APIPath == "" {
-				re.APIPath = "/control"
-			}
-			replicas = append(replicas, re)
-		}
-	}
-
-	return replicas
-}
-
-func boolPtr(b bool) *bool {
-	return &b
-}
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -1,116 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/bakito/adguardhome-sync/pkg/log"
-	"github.com/bakito/adguardhome-sync/pkg/types"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	"go.uber.org/zap"
-)
-
-var envVars = []string{
-	"FEATURES_GENERALSETTINGS",
-	"FEATURES_QUERYLOGCONFIG",
-	"FEATURES_STATSCONFIG",
-	"FEATURES_CLIENTSETTINGS",
-	"FEATURES_SERVICES",
-	"FEATURES_FILTERS",
-	"FEATURES_DHCP_SERVERCONFIG",
-	"FEATURES_DHCP_STATICLEASES",
-	"FEATURES_DNS_SERVERCONFIG",
-	"FEATURES_DNS_ACCESSLISTS",
-	"FEATURES_DNS_REWRITES",
-	"REPLICA1_INTERFACENAME",
-	"REPLICA1_INTERFACWENAME",
-	"REPLICA1_DHCPSERVERENABLED",
-}
-
-var _ = Describe("Run", func() {
-	var logger *zap.SugaredLogger
-	BeforeEach(func() {
-		logger = log.GetLogger("root")
-		for _, envVar := range envVars {
-			Ω(os.Unsetenv(envVar)).ShouldNot(HaveOccurred())
-		}
-		initConfig()
-	})
-	AfterEach(func() {
-		for _, envVar := range envVars {
-			Ω(os.Unsetenv(envVar)).ShouldNot(HaveOccurred())
-		}
-	})
-	Context("getConfig", func() {
-		It("features should be true by default", func() {
-			cfg, err := getConfig(logger)
-			Ω(err).ShouldNot(HaveOccurred())
-			verifyFeatures(cfg, true)
-		})
-		It("features should be false", func() {
-			for _, envVar := range envVars {
-				Ω(os.Setenv(envVar, "false")).ShouldNot(HaveOccurred())
-			}
-			cfg, err := getConfig(logger)
-			Ω(err).ShouldNot(HaveOccurred())
-			verifyFeatures(cfg, false)
-		})
-		Context("interface name", func() {
-			It("should set interface name of replica 1", func() {
-				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
-				Ω(os.Setenv(fmt.Sprintf(envReplicasInterfaceName, "1"), "eth0")).ShouldNot(HaveOccurred())
-				cfg, err := getConfig(logger)
-				Ω(err).ShouldNot(HaveOccurred())
-				Ω(cfg.Replicas[0].InterfaceName).Should(Equal("eth0"))
-			})
-			It("should set interface name of replica 1 from deprecated env", func() {
-				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
-				Ω(os.Setenv(fmt.Sprintf(envReplicasInterfaceNameDeprecated, "1"), "eth0")).ShouldNot(HaveOccurred())
-				cfg, err := getConfig(logger)
-				Ω(err).ShouldNot(HaveOccurred())
-				Ω(cfg.Replicas[0].InterfaceName).Should(Equal("eth0"))
-			})
-			It("deprecated should not overwrite the correct", func() {
-				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
-				Ω(os.Setenv(fmt.Sprintf(envReplicasInterfaceNameDeprecated, "1"), "eth1")).ShouldNot(HaveOccurred())
-				Ω(os.Setenv(fmt.Sprintf(envReplicasInterfaceName, "1"), "eth0")).ShouldNot(HaveOccurred())
-				cfg, err := getConfig(logger)
-				Ω(err).ShouldNot(HaveOccurred())
-				Ω(cfg.Replicas[0].InterfaceName).Should(Equal("eth0"))
-			})
-		})
-		Context("dhcp server", func() {
-			It("should enable the dhcp server of replica 1", func() {
-				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
-				Ω(os.Setenv(fmt.Sprintf(envDHCPServerEnabled, "1"), "true")).ShouldNot(HaveOccurred())
-				cfg, err := getConfig(logger)
-				Ω(err).ShouldNot(HaveOccurred())
-				Ω(cfg.Replicas[0].DHCPServerEnabled).ShouldNot(BeNil())
-				Ω(*cfg.Replicas[0].DHCPServerEnabled).Should(BeTrue())
-			})
-			It("should disable the dhcp server of replica 1", func() {
-				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
-				Ω(os.Setenv(fmt.Sprintf(envDHCPServerEnabled, "1"), "false")).ShouldNot(HaveOccurred())
-				cfg, err := getConfig(logger)
-				Ω(err).ShouldNot(HaveOccurred())
-				Ω(cfg.Replicas[0].DHCPServerEnabled).ShouldNot(BeNil())
-				Ω(*cfg.Replicas[0].DHCPServerEnabled).Should(BeFalse())
-			})
-		})
-	})
-})
-
-func verifyFeatures(cfg *types.Config, value bool) {
-	Ω(cfg.Features.GeneralSettings).Should(Equal(value))
-	Ω(cfg.Features.QueryLogConfig).Should(Equal(value))
-	Ω(cfg.Features.StatsConfig).Should(Equal(value))
-	Ω(cfg.Features.ClientSettings).Should(Equal(value))
-	Ω(cfg.Features.Services).Should(Equal(value))
-	Ω(cfg.Features.Filters).Should(Equal(value))
-	Ω(cfg.Features.DHCP.ServerConfig).Should(Equal(value))
-	Ω(cfg.Features.DHCP.StaticLeases).Should(Equal(value))
-	Ω(cfg.Features.DNS.ServerConfig).Should(Equal(value))
-	Ω(cfg.Features.DNS.AccessLists).Should(Equal(value))
-	Ω(cfg.Features.DNS.Rewrites).Should(Equal(value))
-}
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -1,10 +1,10 @@
 package cmd

 import (
+	"github.com/bakito/adguardhome-sync/pkg/config"
 	"github.com/bakito/adguardhome-sync/pkg/log"
 	"github.com/bakito/adguardhome-sync/pkg/sync"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"gopkg.in/yaml.v3"
 )

@@ -15,12 +15,17 @@ var doCmd = &cobra.Command{
 	Long:  `Synchronizes the configuration form an origin instance to a replica`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		logger = log.GetLogger("run")
-		cfg, err := getConfig(logger)
+		cfg, err := config.Get(cfgFile, cmd.Flags())
 		if err != nil {
 			logger.Error(err)
 			return err
 		}

+		if err := cfg.Init(); err != nil {
+			logger.Error(err)
+			return err
+		}
+
 		if cfg.PrintConfigOnly {
 			config, err := yaml.Marshal(cfg)
 			if err != nil {
@@ -38,74 +43,47 @@ var doCmd = &cobra.Command{

 func init() {
 	rootCmd.AddCommand(doCmd)
-	doCmd.PersistentFlags().String("cron", "", "The cron expression to run in daemon mode")
-	_ = viper.BindPFlag(configCron, doCmd.PersistentFlags().Lookup("cron"))
-	doCmd.PersistentFlags().Bool("runOnStart", true, "Run the sync job on start.")
-	_ = viper.BindPFlag(configRunOnStart, doCmd.PersistentFlags().Lookup("runOnStart"))
-	doCmd.PersistentFlags().Bool("printConfigOnly", false, "Prints the configuration only and exists. "+
+	doCmd.PersistentFlags().String(config.FlagCron, "", "The cron expression to run in daemon mode")
+	doCmd.PersistentFlags().Bool(config.FlagRunOnStart, true, "Run the sync job on start.")
+	doCmd.PersistentFlags().Bool(config.FlagPrintConfigOnly, false, "Prints the configuration only and exists. "+
 		"Can be used to debug the config E.g: when having authentication issues.")
-	_ = viper.BindPFlag(configPrintConfigOnly, doCmd.PersistentFlags().Lookup("printConfigOnly"))
-	doCmd.PersistentFlags().Int("api-port", 8080, "Sync API Port, the API endpoint will be started to enable remote triggering; if 0 port API is disabled.")
-	_ = viper.BindPFlag(configAPIPort, doCmd.PersistentFlags().Lookup("api-port"))
-	doCmd.PersistentFlags().String("api-username", "", "Sync API username")
-	_ = viper.BindPFlag(configAPIUsername, doCmd.PersistentFlags().Lookup("api-username"))
-	doCmd.PersistentFlags().String("api-password", "", "Sync API password")
-	_ = viper.BindPFlag(configAPIPassword, doCmd.PersistentFlags().Lookup("api-password"))
-	doCmd.PersistentFlags().String("api-darkMode", "", "API UI in dark mode")
-	_ = viper.BindPFlag(configAPIDarkMode, doCmd.PersistentFlags().Lookup("api-darkMode"))
+	doCmd.PersistentFlags().Bool(config.FlagContinueOnError, false, "If enabled, the synchronisation task "+
+		"will not fail on single errors, but will log the errors and continue.")

-	doCmd.PersistentFlags().Bool("feature-dhcp-server-config", true, "Enable DHCP server config feature")
-	_ = viper.BindPFlag(configFeatureDHCPServerConfig, doCmd.PersistentFlags().Lookup("feature-dhcp-server-config"))
-	doCmd.PersistentFlags().Bool("feature-dhcp-static-leases", true, "Enable DHCP server static leases feature")
-	_ = viper.BindPFlag(configFeatureDHCPStaticLeases, doCmd.PersistentFlags().Lookup("feature-dhcp-static-leases"))
+	doCmd.PersistentFlags().Int(config.FlagApiPort, 8080, "Sync API Port, the API endpoint will be started to enable remote triggering; if 0 port API is disabled.")
+	doCmd.PersistentFlags().String(config.FlagApiUsername, "", "Sync API username")
+	doCmd.PersistentFlags().String(config.FlagApiPassword, "", "Sync API password")
+	doCmd.PersistentFlags().String(config.FlagApiDarkMode, "", "API UI in dark mode")

-	doCmd.PersistentFlags().Bool("feature-dns-server-config", true, "Enable DNS server config feature")
-	_ = viper.BindPFlag(configFeatureDNServerConfig, doCmd.PersistentFlags().Lookup("feature-dns-server-config"))
-	doCmd.PersistentFlags().Bool("feature-dns-access-lists", true, "Enable DNS server access lists feature")
-	_ = viper.BindPFlag(configFeatureDNSPAccessLists, doCmd.PersistentFlags().Lookup("feature-dns-access-lists"))
-	doCmd.PersistentFlags().Bool("feature-dns-rewrites", true, "Enable DNS rewrites feature")
-	_ = viper.BindPFlag(configFeatureDNSRewrites, doCmd.PersistentFlags().Lookup("feature-dns-rewrites"))
-	doCmd.PersistentFlags().Bool("feature-general-settings", true, "Enable general settings feature")
-	_ = viper.BindPFlag(configFeatureGeneralSettings, doCmd.PersistentFlags().Lookup("feature-general-settings"))
-	_ = viper.BindPFlag("features.generalSettings", doCmd.PersistentFlags().Lookup("feature-general-settings"))
-	doCmd.PersistentFlags().Bool("feature-query-log-config", true, "Enable query log config feature")
-	_ = viper.BindPFlag(configFeatureQueryLogConfig, doCmd.PersistentFlags().Lookup("feature-query-log-config"))
-	doCmd.PersistentFlags().Bool("feature-stats-config", true, "Enable stats config feature")
-	_ = viper.BindPFlag(configFeatureStatsConfig, doCmd.PersistentFlags().Lookup("feature-stats-config"))
-	doCmd.PersistentFlags().Bool("feature-client-settings", true, "Enable client settings feature")
-	_ = viper.BindPFlag(configFeatureClientSettings, doCmd.PersistentFlags().Lookup("feature-client-settings"))
-	doCmd.PersistentFlags().Bool("feature-services", true, "Enable services sync feature")
-	_ = viper.BindPFlag(configFeatureServices, doCmd.PersistentFlags().Lookup("feature-services"))
-	doCmd.PersistentFlags().Bool("feature-filters", true, "Enable filters sync feature")
-	_ = viper.BindPFlag(configFeatureFilters, doCmd.PersistentFlags().Lookup("feature-filters"))
+	doCmd.PersistentFlags().Bool(config.FlagFeatureDhcpServerConfig, true, "Enable DHCP server config feature")
+	doCmd.PersistentFlags().Bool(config.FlagFeatureDhcpStaticLeases, true, "Enable DHCP server static leases feature")

-	doCmd.PersistentFlags().String("origin-url", "", "Origin instance url")
-	_ = viper.BindPFlag(configOriginURL, doCmd.PersistentFlags().Lookup("origin-url"))
-	doCmd.PersistentFlags().String("origin-api-path", "/control", "Origin instance API path")
-	_ = viper.BindPFlag(configOriginAPIPath, doCmd.PersistentFlags().Lookup("origin-api-path"))
-	doCmd.PersistentFlags().String("origin-username", "", "Origin instance username")
-	_ = viper.BindPFlag(configOriginUsername, doCmd.PersistentFlags().Lookup("origin-username"))
-	doCmd.PersistentFlags().String("origin-password", "", "Origin instance password")
-	_ = viper.BindPFlag(configOriginPassword, doCmd.PersistentFlags().Lookup("origin-password"))
-	doCmd.PersistentFlags().String("origin-cookie", "", "If Set, uses a cookie for authentication")
-	_ = viper.BindPFlag(configOriginCookie, doCmd.PersistentFlags().Lookup("origin-cookie"))
-	doCmd.PersistentFlags().Bool("origin-insecure-skip-verify", false, "Enable Origin instance InsecureSkipVerify")
-	_ = viper.BindPFlag(configOriginInsecureSkipVerify, doCmd.PersistentFlags().Lookup("origin-insecure-skip-verify"))
+	doCmd.PersistentFlags().Bool(config.FlagFeatureDnsServerConfig, true, "Enable DNS server config feature")
+	doCmd.PersistentFlags().Bool(config.FlagFeatureDnsAccessLists, true, "Enable DNS server access lists feature")
+	doCmd.PersistentFlags().Bool(config.FlagFeatureDnsRewrites, true, "Enable DNS rewrites feature")

-	doCmd.PersistentFlags().String("replica-url", "", "Replica instance url")
-	_ = viper.BindPFlag(configReplicaURL, doCmd.PersistentFlags().Lookup("replica-url"))
-	doCmd.PersistentFlags().String("replica-api-path", "/control", "Replica instance API path")
-	_ = viper.BindPFlag(configReplicaAPIPath, doCmd.PersistentFlags().Lookup("replica-api-path"))
-	doCmd.PersistentFlags().String("replica-username", "", "Replica instance username")
-	_ = viper.BindPFlag(configReplicaUsername, doCmd.PersistentFlags().Lookup("replica-username"))
-	doCmd.PersistentFlags().String("replica-password", "", "Replica instance password")
-	_ = viper.BindPFlag(configReplicaPassword, doCmd.PersistentFlags().Lookup("replica-password"))
-	doCmd.PersistentFlags().String("replica-cookie", "", "If Set, uses a cookie for authentication")
-	_ = viper.BindPFlag(configReplicaCookie, doCmd.PersistentFlags().Lookup("replica-cookie"))
-	doCmd.PersistentFlags().Bool("replica-insecure-skip-verify", false, "Enable Replica instance InsecureSkipVerify")
-	_ = viper.BindPFlag(configReplicaInsecureSkipVerify, doCmd.PersistentFlags().Lookup("replica-insecure-skip-verify"))
-	doCmd.PersistentFlags().Bool("replica-auto-setup", false, "Enable automatic setup of new AdguardHome instances. This replaces the setup wizard.")
-	_ = viper.BindPFlag(configReplicaAutoSetup, doCmd.PersistentFlags().Lookup("replica-auto-setup"))
-	doCmd.PersistentFlags().String("replica-interface-name", "", "Optional change the interface name of the replica if it differs from the master")
-	_ = viper.BindPFlag(configReplicaInterfaceName, doCmd.PersistentFlags().Lookup("replica-interface-name"))
+	doCmd.PersistentFlags().Bool(config.FlagFeatureGeneral, true, "Enable general settings feature")
+	doCmd.PersistentFlags().Bool(config.FlagFeatureQueryLog, true, "Enable query log config feature")
+	doCmd.PersistentFlags().Bool(config.FlagFeatureStats, true, "Enable stats config feature")
+	doCmd.PersistentFlags().Bool(config.FlagFeatureClient, true, "Enable client settings feature")
+	doCmd.PersistentFlags().Bool(config.FlagFeatureServices, true, "Enable services sync feature")
+	doCmd.PersistentFlags().Bool(config.FlagFeatureFilters, true, "Enable filters sync feature")
+
+	doCmd.PersistentFlags().String(config.FlagOriginURL, "", "Origin instance url")
+	doCmd.PersistentFlags().String(config.FlagOriginWebURL, "", "Origin instance web url used in the web interface (default: <origin-url>)")
+	doCmd.PersistentFlags().String(config.FlagOriginApiPath, "/control", "Origin instance API path")
+	doCmd.PersistentFlags().String(config.FlagOriginUsername, "", "Origin instance username")
+	doCmd.PersistentFlags().String(config.FlagOriginPassword, "", "Origin instance password")
+	doCmd.PersistentFlags().String(config.FlagOriginCookie, "", "If Set, uses a cookie for authentication")
+	doCmd.PersistentFlags().Bool(config.FlagOriginISV, false, "Enable Origin instance InsecureSkipVerify")
+
+	doCmd.PersistentFlags().String(config.FlagReplicaURL, "", "Replica instance url")
+	doCmd.PersistentFlags().String(config.FlagReplicaWebURL, "", "Replica instance web url used in the web interface (default: <replica-url>)")
+	doCmd.PersistentFlags().String(config.FlagReplicaApiPath, "/control", "Replica instance API path")
+	doCmd.PersistentFlags().String(config.FlagReplicaUsername, "", "Replica instance username")
+	doCmd.PersistentFlags().String(config.FlagReplicaPassword, "", "Replica instance password")
+	doCmd.PersistentFlags().String(config.FlagReplicaCookie, "", "If Set, uses a cookie for authentication")
+	doCmd.PersistentFlags().Bool(config.FlagReplicaISV, false, "Enable Replica instance InsecureSkipVerify")
+	doCmd.PersistentFlags().Bool(config.FlagReplicaAutoSetup, false, "Enable automatic setup of new AdguardHome instances. This replaces the setup wizard.")
+	doCmd.PersistentFlags().String(config.FlagReplicaInterfaceName, "", "Optional change the interface name of the replica if it differs from the master")
 }
--- a/go.mod
+++ b/go.mod
@@ -3,18 +3,17 @@ module github.com/bakito/adguardhome-sync
 go 1.21

 require (
+	github.com/caarlos0/env/v10 v10.0.0
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-resty/resty/v2 v2.11.0
+	github.com/go-resty/resty/v2 v2.9.1
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.5.0
 	github.com/jinzhu/copier v0.4.0
-	github.com/mitchellh/go-homedir v1.1.0
-	github.com/oapi-codegen/runtime v1.1.0
+	github.com/oapi-codegen/runtime v1.1.1
 	github.com/onsi/ginkgo/v2 v2.13.2
 	github.com/onsi/gomega v1.30.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/spf13/cobra v1.8.0
-	github.com/spf13/viper v1.18.2
 	go.uber.org/zap v1.26.0
 	golang.org/x/mod v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -23,55 +22,45 @@ require (

 require (
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
-	github.com/bytedance/sonic v1.10.0 // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
-	github.com/chenzhuoyu/iasm v0.9.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.15.1 // indirect
+	github.com/go-playground/validator/v10 v10.16.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/arch v0.7.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.14.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/tools v0.16.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
--- a/go.sum
+++ b/go.sum
@@ -4,14 +4,17 @@ github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic v1.10.0 h1:qtNZduETEIWJVIyDl01BeNxur2rW9OwTQ/yBqFRkKEk=
-github.com/bytedance/sonic v1.10.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
+github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/caarlos0/env/v10 v10.0.0 h1:yIHUBZGsyqCnpTkbjk8asUlx6RFhhEs+h7TOBdgdzXA=
+github.com/caarlos0/env/v10 v10.0.0/go.mod h1:ZfulV76NvVPw3tm591U4SwL3Xx9ldzBP9aGxzeN7G18=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
 github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
-github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
 github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
+github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
+github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -20,12 +23,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
-github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
+github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
@@ -38,10 +37,10 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.15.1 h1:BSe8uhN+xQ4r5guV/ywQI4gO59C2raYcGffYWZEjZzM=
-github.com/go-playground/validator/v10 v10.15.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
-github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8=
-github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
+github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE=
+github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-resty/resty/v2 v2.9.1 h1:PIgGx4VrHvag0juCJ4dDv3MiFRlDmP0vicBucwf+gLM=
+github.com/go-resty/resty/v2 v2.9.1/go.mod h1:4/GYJVjh9nhkhGR6AUNW3XhpDYNUr+Uvy9gV/VGZIy4=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
@@ -50,10 +49,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -64,8 +61,6 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -77,25 +72,17 @@ github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPci
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
+github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
 github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -103,38 +90,24 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/oapi-codegen/runtime v1.1.0 h1:rJpoNUawn5XTvekgfkvSZr0RqEnoYpFkyvrzfWeFKWM=
-github.com/oapi-codegen/runtime v1.1.0/go.mod h1:BeSfBkWWWnAnGdyS+S/GnlbmHKzf8/hwkvelJZDeKA8=
+github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro=
+github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg=
 github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs=
 github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
 github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
 github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
-github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
-github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
-github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
-github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
-github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
-github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
-github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
-github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
-github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
-github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
 github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
-github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
@@ -148,12 +121,10 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
-github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
@@ -165,17 +136,15 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
 go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
-golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
-golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -192,7 +161,7 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -214,14 +183,14 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -230,7 +199,7 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -240,22 +209,19 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -80,9 +80,9 @@ func New(config types.AdGuardInstance) (Client, error) {
 	}

 	return &client{
-		host:   u.Host,
+		host:   config.Host,
 		client: cl,
-		log:    l.With("host", u.Host),
+		log:    l.With("host", config.Host),
 	}, nil
 }

@@ -96,9 +96,9 @@ type Client interface {
 	DeleteRewriteEntries(e ...model.RewriteEntry) error
 	Filtering() (*model.FilterStatus, error)
 	ToggleFiltering(enabled bool, interval int) error
-	AddFilters(whitelist bool, e ...model.Filter) error
-	DeleteFilters(whitelist bool, e ...model.Filter) error
-	UpdateFilters(whitelist bool, e ...model.Filter) error
+	AddFilter(whitelist bool, f model.Filter) error
+	DeleteFilter(whitelist bool, f model.Filter) error
+	UpdateFilter(whitelist bool, f model.Filter) error
 	RefreshFilters(whitelist bool) error
 	SetCustomRules(rules *[]string) error
 	SafeBrowsing() (bool, error)
@@ -114,9 +114,9 @@ type Client interface {
 	SetBlockedServices(services *model.BlockedServicesArray) error
 	SetBlockedServicesSchedule(schedule *model.BlockedServicesSchedule) error
 	Clients() (*model.Clients, error)
-	AddClients(client ...*model.Client) error
-	UpdateClients(client ...*model.Client) error
-	DeleteClients(client ...*model.Client) error
+	AddClient(client *model.Client) error
+	UpdateClient(client *model.Client) error
+	DeleteClient(client *model.Client) error
 	QueryLogConfig() (*model.QueryLogConfig, error)
 	SetQueryLogConfig(*model.QueryLogConfig) error
 	StatsConfig() (*model.StatsConfig, error)
@@ -128,8 +128,8 @@ type Client interface {
 	SetDNSConfig(*model.DNSConfig) error
 	DhcpConfig() (*model.DhcpStatus, error)
 	SetDhcpConfig(*model.DhcpStatus) error
-	AddDHCPStaticLeases(leases ...model.DhcpStaticLease) error
-	DeleteDHCPStaticLeases(leases ...model.DhcpStaticLease) error
+	AddDHCPStaticLease(lease model.DhcpStaticLease) error
+	DeleteDHCPStaticLease(lease model.DhcpStaticLease) error
 }

 type client struct {
@@ -169,7 +169,7 @@ func (cl *client) RewriteList() (*model.RewriteEntries, error) {
 func (cl *client) AddRewriteEntries(entries ...model.RewriteEntry) error {
 	for i := range entries {
 		e := entries[i]
-		cl.log.With("domain", e.Domain, "answer", e.Answer).Info("Add rewrite entry")
+		cl.log.With("domain", e.Domain, "answer", e.Answer).Info("Add DNS rewrite entry")
 		err := cl.doPost(cl.client.R().EnableTrace().SetBody(&e), "/rewrite/add")
 		if err != nil {
 			return err
@@ -181,7 +181,7 @@ func (cl *client) AddRewriteEntries(entries ...model.RewriteEntry) error {
 func (cl *client) DeleteRewriteEntries(entries ...model.RewriteEntry) error {
 	for i := range entries {
 		e := entries[i]
-		cl.log.With("domain", e.Domain, "answer", e.Answer).Info("Delete rewrite entry")
+		cl.log.With("domain", e.Domain, "answer", e.Answer).Info("Delete DNS rewrite entry")
 		err := cl.doPost(cl.client.R().EnableTrace().SetBody(&e), "/rewrite/delete")
 		if err != nil {
 			return err
@@ -229,43 +229,25 @@ func (cl *client) Filtering() (*model.FilterStatus, error) {
 	return f, err
 }

-func (cl *client) AddFilters(whitelist bool, filters ...model.Filter) error {
-	for _, f := range filters {
-		cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Add filter")
-		ff := &model.AddUrlRequest{Name: utils.Ptr(f.Name), Url: utils.Ptr(f.Url), Whitelist: utils.Ptr(whitelist)}
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(ff), "/filtering/add_url")
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+func (cl *client) AddFilter(whitelist bool, f model.Filter) error {
+	cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Add filter")
+	ff := &model.AddUrlRequest{Name: utils.Ptr(f.Name), Url: utils.Ptr(f.Url), Whitelist: utils.Ptr(whitelist)}
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(ff), "/filtering/add_url")
 }

-func (cl *client) DeleteFilters(whitelist bool, filters ...model.Filter) error {
-	for _, f := range filters {
-		cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Delete filter")
-		ff := &model.RemoveUrlRequest{Url: utils.Ptr(f.Url), Whitelist: utils.Ptr(whitelist)}
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(ff), "/filtering/remove_url")
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+func (cl *client) DeleteFilter(whitelist bool, f model.Filter) error {
+	cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Delete filter")
+	ff := &model.RemoveUrlRequest{Url: utils.Ptr(f.Url), Whitelist: utils.Ptr(whitelist)}
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(ff), "/filtering/remove_url")
 }

-func (cl *client) UpdateFilters(whitelist bool, filters ...model.Filter) error {
-	for _, f := range filters {
-		cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Update filter")
-		fu := &model.FilterSetUrl{
-			Whitelist: utils.Ptr(whitelist), Url: utils.Ptr(f.Url),
-			Data: &model.FilterSetUrlData{Name: f.Name, Url: f.Url, Enabled: f.Enabled},
-		}
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(fu), "/filtering/set_url")
-		if err != nil {
-			return err
-		}
+func (cl *client) UpdateFilter(whitelist bool, f model.Filter) error {
+	cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Update filter")
+	fu := &model.FilterSetUrl{
+		Whitelist: utils.Ptr(whitelist), Url: utils.Ptr(f.Url),
+		Data: &model.FilterSetUrlData{Name: f.Name, Url: f.Url, Enabled: f.Enabled},
 	}
-	return nil
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(fu), "/filtering/set_url")
 }

 func (cl *client) RefreshFilters(whitelist bool) error {
@@ -319,39 +301,19 @@ func (cl *client) Clients() (*model.Clients, error) {
 	return clients, err
 }

-func (cl *client) AddClients(clients ...*model.Client) error {
-	for i := range clients {
-		client := clients[i]
-		cl.log.With("name", *client.Name).Info("Add client")
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(client), "/clients/add")
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+func (cl *client) AddClient(client *model.Client) error {
+	cl.log.With("name", *client.Name).Info("Add client settings")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(client), "/clients/add")
 }

-func (cl *client) UpdateClients(clients ...*model.Client) error {
-	for _, client := range clients {
-		cl.log.With("name", *client.Name).Info("Update client")
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(&model.ClientUpdate{Name: client.Name, Data: client}), "/clients/update")
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+func (cl *client) UpdateClient(client *model.Client) error {
+	cl.log.With("name", *client.Name).Info("Update client settings")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(&model.ClientUpdate{Name: client.Name, Data: client}), "/clients/update")
 }

-func (cl *client) DeleteClients(clients ...*model.Client) error {
-	for i := range clients {
-		client := clients[i]
-		cl.log.With("name", *client.Name).Info("Delete client")
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(client), "/clients/delete")
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+func (cl *client) DeleteClient(client *model.Client) error {
+	cl.log.With("name", *client.Name).Info("Delete client settings")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(client), "/clients/delete")
 }

 func (cl *client) QueryLogConfig() (*model.QueryLogConfig, error) {
@@ -435,24 +397,20 @@ func (cl *client) SetDhcpConfig(config *model.DhcpStatus) error {
 	return cl.doPost(cl.client.R().EnableTrace().SetBody(config), "/dhcp/set_config")
 }

-func (cl *client) AddDHCPStaticLeases(leases ...model.DhcpStaticLease) error {
-	for _, l := range leases {
-		cl.log.With("mac", l.Mac, "ip", l.Ip, "hostname", l.Hostname).Info("Add static dhcp lease")
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(l), "/dhcp/add_static_lease")
-		if err != nil {
-			return err
-		}
+func (cl *client) AddDHCPStaticLease(l model.DhcpStaticLease) error {
+	cl.log.With("mac", l.Mac, "ip", l.Ip, "hostname", l.Hostname).Info("Add static dhcp lease")
+	err := cl.doPost(cl.client.R().EnableTrace().SetBody(l), "/dhcp/add_static_lease")
+	if err != nil {
+		return err
 	}
 	return nil
 }

-func (cl *client) DeleteDHCPStaticLeases(leases ...model.DhcpStaticLease) error {
-	for _, l := range leases {
-		cl.log.With("mac", l.Mac, "ip", l.Ip, "hostname", l.Hostname).Info("Delete static dhcp lease")
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(l), "/dhcp/remove_static_lease")
-		if err != nil {
-			return err
-		}
+func (cl *client) DeleteDHCPStaticLease(l model.DhcpStaticLease) error {
+	cl.log.With("mac", l.Mac, "ip", l.Ip, "hostname", l.Hostname).Info("Delete static dhcp lease")
+	err := cl.doPost(cl.client.R().EnableTrace().SetBody(l), "/dhcp/remove_static_lease")
+	if err != nil {
+		return err
 	}
 	return nil
 }
--- a/pkg/client/client_test.go
+++ b/pkg/client/client_test.go
@@ -35,7 +35,10 @@ var _ = Describe("Client", func() {

 	Context("Host", func() {
 		It("should read the current host", func() {
-			cl, _ := client.New(types.AdGuardInstance{URL: "https://foo.bar:3000"})
+			inst := types.AdGuardInstance{URL: "https://foo.bar:3000"}
+			err := inst.Init()
+			Ω(err).ShouldNot(HaveOccurred())
+			cl, _ := client.New(inst)
 			host := cl.Host()
 			Ω(host).Should(Equal("foo.bar:3000"))
 		})
@@ -69,7 +72,9 @@ var _ = Describe("Client", func() {
 				`{"name":"","url":"foo","whitelist":true}`,
 				`{"name":"","url":"bar","whitelist":true}`,
 			)
-			err := cl.AddFilters(true, model.Filter{Url: "foo"}, model.Filter{Url: "bar"})
+			err := cl.AddFilter(true, model.Filter{Url: "foo"})
+			Ω(err).ShouldNot(HaveOccurred())
+			err = cl.AddFilter(true, model.Filter{Url: "bar"})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should update Filters", func() {
@@ -77,7 +82,9 @@ var _ = Describe("Client", func() {
 				`{"data":{"enabled":false,"name":"","url":"foo"},"url":"foo","whitelist":true}`,
 				`{"data":{"enabled":false,"name":"","url":"bar"},"url":"bar","whitelist":true}`,
 			)
-			err := cl.UpdateFilters(true, model.Filter{Url: "foo"}, model.Filter{Url: "bar"})
+			err := cl.UpdateFilter(true, model.Filter{Url: "foo"})
+			Ω(err).ShouldNot(HaveOccurred())
+			err = cl.UpdateFilter(true, model.Filter{Url: "bar"})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should delete Filters", func() {
@@ -85,7 +92,9 @@ var _ = Describe("Client", func() {
 				`{"url":"foo","whitelist":true}`,
 				`{"url":"bar","whitelist":true}`,
 			)
-			err := cl.DeleteFilters(true, model.Filter{Url: "foo"}, model.Filter{Url: "bar"})
+			err := cl.DeleteFilter(true, model.Filter{Url: "foo"})
+			Ω(err).ShouldNot(HaveOccurred())
+			err = cl.DeleteFilter(true, model.Filter{Url: "bar"})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
@@ -264,21 +273,21 @@ var _ = Describe("Client", func() {
 			ts, cl = ClientPost("/clients/add",
 				`{"ids":["id"],"name":"foo"}`,
 			)
-			err := cl.AddClients(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
+			err := cl.AddClient(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should update Clients", func() {
 			ts, cl = ClientPost("/clients/update",
 				`{"data":{"ids":["id"],"name":"foo"},"name":"foo"}`,
 			)
-			err := cl.UpdateClients(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
+			err := cl.UpdateClient(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should delete Clients", func() {
 			ts, cl = ClientPost("/clients/delete",
 				`{"ids":["id"],"name":"foo"}`,
 			)
-			err := cl.DeleteClients(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
+			err := cl.DeleteClient(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
--- a/pkg/client/model/model-functions.go
+++ b/pkg/client/model/model-functions.go
@@ -16,6 +16,22 @@ func (c *DhcpStatus) Clone() *DhcpStatus {
 	return clone
 }

+func (c *DhcpStatus) cleanV4V6() {
+	if c.V4 != nil && !c.V4.isValid() {
+		c.V4 = nil
+	}
+	if c.V6 != nil && !c.V6.isValid() {
+		c.V6 = nil
+	}
+}
+
+// CleanAndEquals dhcp server config equal check where V4 and V6 are cleaned in advance
+func (c *DhcpStatus) CleanAndEquals(o *DhcpStatus) bool {
+	c.cleanV4V6()
+	o.cleanV4V6()
+	return c.Equals(o)
+}
+
 // Equals dhcp server config equal check
 func (c *DhcpStatus) Equals(o *DhcpStatus) bool {
 	return utils.JsonEquals(c, o)
@@ -26,11 +42,14 @@ func (c *DhcpStatus) HasConfig() bool {
 }

 func (j DhcpConfigV4) isValid() bool {
-	return j.GatewayIp != nil && j.SubnetMask != nil && j.RangeStart != nil && j.RangeEnd != nil
+	return j.GatewayIp != nil && *j.GatewayIp != "" &&
+		j.SubnetMask != nil && *j.SubnetMask != "" &&
+		j.RangeStart != nil && *j.RangeStart != "" &&
+		j.RangeEnd != nil && *j.RangeEnd != ""
 }

 func (j DhcpConfigV6) isValid() bool {
-	return j.RangeStart != nil
+	return j.RangeStart != nil && *j.RangeStart != ""
 }

 type DhcpStaticLeases []DhcpStaticLease
--- a/pkg/client/model/model_test.go
+++ b/pkg/client/model/model_test.go
@@ -403,7 +403,29 @@ var _ = Describe("Types", func() {
 				}
 				Ω(dc1.HasConfig()).Should(BeFalse())
 			})
-			It("should not have a v4 config", func() {
+			It("should not have a v4 config with nil IP", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp: nil,
+					},
+					V6: &model.DhcpConfigV6{
+						RangeStart: utils.Ptr("1.2.3.5"),
+					},
+				}
+				Ω(dc1.HasConfig()).Should(BeTrue())
+			})
+			It("should not have a v4 config with empty IP", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp: utils.Ptr(""),
+					},
+					V6: &model.DhcpConfigV6{
+						RangeStart: utils.Ptr("1.2.3.5"),
+					},
+				}
+				Ω(dc1.HasConfig()).Should(BeTrue())
+			})
+			It("should not have a v6 config", func() {
 				dc1 := &model.DhcpStatus{
 					V4: &model.DhcpConfigV4{
 						GatewayIp:     utils.Ptr("1.2.3.4"),
@@ -416,15 +438,6 @@ var _ = Describe("Types", func() {
 				}
 				Ω(dc1.HasConfig()).Should(BeTrue())
 			})
-			It("should not have a v6 config", func() {
-				dc1 := &model.DhcpStatus{
-					V4: &model.DhcpConfigV4{},
-					V6: &model.DhcpConfigV6{
-						RangeStart: utils.Ptr("1.2.3.5"),
-					},
-				}
-				Ω(dc1.HasConfig()).Should(BeTrue())
-			})
 		})
 	})
 })
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -0,0 +1,84 @@
+package config
+
+import (
+	"errors"
+	"regexp"
+
+	"github.com/bakito/adguardhome-sync/pkg/log"
+	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/caarlos0/env/v10"
+)
+
+var (
+	envReplicasURLPattern = regexp.MustCompile(`^REPLICA(\d+)_URL=(.*)`)
+	logger                = log.GetLogger("config")
+)
+
+func Get(configFile string, flags Flags) (*types.Config, error) {
+	path, err := configFilePath(configFile)
+	if err != nil {
+		return nil, err
+	}
+
+	cfg := initialConfig()
+
+	// read yaml config
+	if err := readFile(cfg, path); err != nil {
+		return nil, err
+	}
+
+	// overwrite from command flags
+	if err := readFlags(cfg, flags); err != nil {
+		return nil, err
+	}
+
+	// overwrite from env vars
+
+	if err := env.Parse(cfg); err != nil {
+		return nil, err
+	}
+	if err := env.ParseWithOptions(&cfg.Origin, env.Options{Prefix: "ORIGIN_"}); err != nil {
+		return nil, err
+	}
+	if err := env.ParseWithOptions(cfg.Replica, env.Options{Prefix: "REPLICA_"}); err != nil {
+		return nil, err
+	}
+
+	if cfg.Replica != nil &&
+		cfg.Replica.URL == "" &&
+		cfg.Replica.Username == "" {
+		cfg.Replica = nil
+	}
+
+	if len(cfg.Replicas) > 0 && cfg.Replica != nil {
+		return nil, errors.New("mixed replica config in use. " +
+			"Do not use single replica and numbered (list) replica config combined")
+	}
+
+	handleDeprecatedEnvVars(cfg)
+
+	if cfg.Replica != nil {
+		cfg.Replicas = []types.AdGuardInstance{*cfg.Replica}
+		cfg.Replica = nil
+	}
+
+	cfg.Replicas, err = enrichReplicasFromEnv(cfg.Replicas)
+
+	return cfg, err
+}
+
+func initialConfig() *types.Config {
+	return &types.Config{
+		RunOnStart: true,
+		Origin: types.AdGuardInstance{
+			APIPath: "/control",
+		},
+		Replica: &types.AdGuardInstance{
+			APIPath: "/control",
+		},
+		API: types.API{
+			Port: 8080,
+		},
+		Features: types.NewFeatures(true),
+	}
+}
--- a/pkg/config/config_suite_test.go
+++ b/pkg/config/config_suite_test.go
@@ -1,4 +1,4 @@
-package cmd_test
+package config_test

 import (
 	"testing"
@@ -9,5 +9,5 @@ import (

 func TestCmd(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Cmd Suite")
+	RunSpecs(t, "Config Suite")
 }
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -0,0 +1,194 @@
+package config_test
+
+import (
+	"os"
+
+	"github.com/bakito/adguardhome-sync/pkg/config"
+	flagsmock "github.com/bakito/adguardhome-sync/pkg/mocks/flags"
+	gm "github.com/golang/mock/gomock"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Config", func() {
+	Context("Get", func() {
+		var (
+			flags    *flagsmock.MockFlags
+			mockCtrl *gm.Controller
+		)
+		BeforeEach(func() {
+			mockCtrl = gm.NewController(GinkgoT())
+			flags = flagsmock.NewMockFlags(mockCtrl)
+		})
+		AfterEach(func() {
+			defer mockCtrl.Finish()
+		})
+		Context("Get", func() {
+			Context("Mixed Config", func() {
+				It("should have the origin URL from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+					_, err := config.Get("../../testdata/config_test_replicas_and_replica.yaml", flags)
+					Ω(err).Should(HaveOccurred())
+					Ω(err.Error()).Should(ContainSubstring("mixed replica config in use"))
+				})
+			})
+			Context("Origin Url", func() {
+				It("should have the origin URL from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Origin.URL).Should(Equal("https://origin-file:443"))
+				})
+				It("should have the origin URL from the config flags", func() {
+					flags.EXPECT().Changed(config.FlagOriginURL).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetString(config.FlagOriginURL).Return("https://origin-flag:443", nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Origin.URL).Should(Equal("https://origin-flag:443"))
+				})
+				It("should have the origin URL from the config env var", func() {
+					os.Setenv("ORIGIN_URL", "https://origin-env:443")
+					defer func() {
+						_ = os.Unsetenv("ORIGIN_URL")
+					}()
+					flags.EXPECT().Changed(config.FlagOriginURL).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetString(config.FlagOriginURL).Return("https://origin-flag:443", nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Origin.URL).Should(Equal("https://origin-env:443"))
+				})
+			})
+			Context("Replica insecure skip verify", func() {
+				It("should have the insecure skip verify from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replica.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].InsecureSkipVerify).Should(BeFalse())
+				})
+				It("should have the insecure skip verify from the config flags", func() {
+					flags.EXPECT().Changed(config.FlagReplicaISV).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetBool(config.FlagReplicaISV).Return(true, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replica.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].InsecureSkipVerify).Should(BeTrue())
+				})
+				It("should have the insecure skip verify from the config env var", func() {
+					os.Setenv("REPLICA_INSECURE_SKIP_VERIFY", "false")
+					defer func() {
+						_ = os.Unsetenv("REPLICA_INSECURE_SKIP_VERIFY")
+					}()
+					flags.EXPECT().Changed(config.FlagReplicaISV).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetBool(config.FlagReplicaISV).Return(true, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replica.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].InsecureSkipVerify).Should(BeFalse())
+				})
+			})
+
+			Context("Replica 1 insecure skip verify", func() {
+				It("should have the insecure skip verify from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].InsecureSkipVerify).Should(BeFalse())
+				})
+				It("should have the insecure skip verify from the config env var", func() {
+					os.Setenv("REPLICA1_INSECURE_SKIP_VERIFY", "true")
+					defer func() {
+						_ = os.Unsetenv("REPLICA1_INSECURE_SKIP_VERIFY")
+					}()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].InsecureSkipVerify).Should(BeTrue())
+				})
+			})
+			Context("API Port", func() {
+				It("should have the api port from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.API.Port).Should(Equal(9090))
+				})
+				It("should have the api port from the config flags", func() {
+					flags.EXPECT().Changed(config.FlagApiPort).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetInt(config.FlagApiPort).Return(9990, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.API.Port).Should(Equal(9990))
+				})
+				It("should have the api port from the config env var", func() {
+					os.Setenv("API_PORT", "9999")
+					defer func() {
+						_ = os.Unsetenv("API_PORT")
+					}()
+					flags.EXPECT().Changed(config.FlagApiPort).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetInt(config.FlagApiPort).Return(9990, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.API.Port).Should(Equal(9999))
+				})
+			})
+			Context("Feature DNS Server Config", func() {
+				It("should have the feature dns server config from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Features.DNS.ServerConfig).Should(BeFalse())
+				})
+				It("should have the feature dns server config from the config flags", func() {
+					flags.EXPECT().Changed(config.FlagFeatureDnsServerConfig).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetBool(config.FlagFeatureDnsServerConfig).Return(true, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Features.DNS.ServerConfig).Should(BeTrue())
+				})
+				It("should have the feature dns server config from the config env var", func() {
+					os.Setenv("FEATURES_DNS_SERVER_CONFIG", "false")
+					defer func() {
+						_ = os.Unsetenv("FEATURES_DNS_SERVER_CONFIG")
+					}()
+					flags.EXPECT().Changed(config.FlagFeatureDnsServerConfig).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetBool(config.FlagFeatureDnsServerConfig).Return(true, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Features.DNS.ServerConfig).Should(BeFalse())
+				})
+				It("should have the feature dns server config from the config DEPRECATED env var", func() {
+					os.Setenv("FEATURES_DNS_SERVERCONFIG", "false")
+					defer func() {
+						_ = os.Unsetenv("FEATURES_DNS_SERVERCONFIG")
+					}()
+					flags.EXPECT().Changed(config.FlagFeatureDnsServerConfig).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetBool(config.FlagFeatureDnsServerConfig).Return(true, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Features.DNS.ServerConfig).Should(BeFalse())
+				})
+			})
+		})
+	})
+})
--- a/pkg/config/deprecated_env_test.go
+++ b/pkg/config/deprecated_env_test.go
@@ -0,0 +1,138 @@
+package config_test
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/bakito/adguardhome-sync/pkg/config"
+	"github.com/bakito/adguardhome-sync/pkg/types"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var envVars = []string{
+	"FEATURES_GENERAL_SETTINGS",
+	"FEATURES_QUERY_LOG_CONFIG",
+	"FEATURES_STATS_CONFIG",
+	"FEATURES_CLIENT_SETTINGS",
+	"FEATURES_SERVICES",
+	"FEATURES_FILTERS",
+	"FEATURES_DHCP_SERVER_CONFIG",
+	"FEATURES_DHCP_STATIC_LEASES",
+	"FEATURES_DNS_SERVER_CONFIG",
+	"FEATURES_DNS_ACCESS_LISTS",
+	"FEATURES_DNS_REWRITES",
+	"REPLICA1_INTERFACE_NAME",
+	"REPLICA1_DHCP_SERVER_ENABLED",
+}
+
+var deprecatedEnvVars = []string{
+	"FEATURES_GENERALSETTINGS",
+	"FEATURES_QUERYLOGCONFIG",
+	"FEATURES_STATSCONFIG",
+	"FEATURES_CLIENTSETTINGS",
+	"FEATURES_SERVICES",
+	"FEATURES_FILTERS",
+	"FEATURES_DHCP_SERVERCONFIG",
+	"FEATURES_DHCP_STATICLEASES",
+	"FEATURES_DNS_SERVERCONFIG",
+	"FEATURES_DNS_ACCESSLISTS",
+	"FEATURES_DNS_REWRITES",
+	"REPLICA1_INTERFACENAME",
+	"REPLICA1_DHCPSERVERENABLED",
+}
+
+var _ = Describe("Config", func() {
+	Context("deprecated", func() {
+		BeforeEach(func() {
+			for _, envVar := range deprecatedEnvVars {
+				Ω(os.Setenv(envVar, "false")).ShouldNot(HaveOccurred())
+			}
+		})
+		AfterEach(func() {
+			for _, envVar := range deprecatedEnvVars {
+				Ω(os.Unsetenv(envVar)).ShouldNot(HaveOccurred())
+			}
+		})
+		Context("Get", func() {
+			It("features should be false", func() {
+				cfg, err := config.Get("", nil)
+				Ω(err).ShouldNot(HaveOccurred())
+				verifyFeatures(cfg, false)
+			})
+		})
+	})
+	Context("current", func() {
+		BeforeEach(func() {
+			for _, envVar := range envVars {
+				Ω(os.Unsetenv(envVar)).ShouldNot(HaveOccurred())
+			}
+		})
+		AfterEach(func() {
+			for _, envVar := range envVars {
+				Ω(os.Unsetenv(envVar)).ShouldNot(HaveOccurred())
+			}
+		})
+		Context("Get", func() {
+			It("features should be true by default", func() {
+				cfg, err := config.Get("", nil)
+				Ω(err).ShouldNot(HaveOccurred())
+				verifyFeatures(cfg, true)
+			})
+			It("features should be true by default", func() {
+				cfg, err := config.Get("", nil)
+				Ω(err).ShouldNot(HaveOccurred())
+				verifyFeatures(cfg, true)
+			})
+			It("features should be false", func() {
+				for _, envVar := range envVars {
+					Ω(os.Setenv(envVar, "false")).ShouldNot(HaveOccurred())
+				}
+				cfg, err := config.Get("", nil)
+				Ω(err).ShouldNot(HaveOccurred())
+				verifyFeatures(cfg, false)
+			})
+			Context("interface name", func() {
+				It("should set interface name of replica 1", func() {
+					Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
+					Ω(os.Setenv(fmt.Sprintf("REPLICA%s_INTERFACE_NAME", "1"), "eth0")).ShouldNot(HaveOccurred())
+					cfg, err := config.Get("", nil)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].InterfaceName).Should(Equal("eth0"))
+				})
+			})
+			Context("dhcp server", func() {
+				It("should enable the dhcp server of replica 1", func() {
+					Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
+					Ω(os.Setenv(fmt.Sprintf("REPLICA%s_DHCPSERVERENABLED", "1"), "true")).ShouldNot(HaveOccurred())
+					cfg, err := config.Get("", nil)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].DHCPServerEnabled).ShouldNot(BeNil())
+					Ω(*cfg.Replicas[0].DHCPServerEnabled).Should(BeTrue())
+				})
+				It("should disable the dhcp server of replica 1", func() {
+					Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
+					Ω(os.Setenv(fmt.Sprintf("REPLICA%s_DHCPSERVERENABLED", "1"), "false")).ShouldNot(HaveOccurred())
+					cfg, err := config.Get("", nil)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].DHCPServerEnabled).ShouldNot(BeNil())
+					Ω(*cfg.Replicas[0].DHCPServerEnabled).Should(BeFalse())
+				})
+			})
+		})
+	})
+})
+
+func verifyFeatures(cfg *types.Config, value bool) {
+	Ω(cfg.Features.GeneralSettings).Should(Equal(value))
+	Ω(cfg.Features.QueryLogConfig).Should(Equal(value))
+	Ω(cfg.Features.StatsConfig).Should(Equal(value))
+	Ω(cfg.Features.ClientSettings).Should(Equal(value))
+	Ω(cfg.Features.Services).Should(Equal(value))
+	Ω(cfg.Features.Filters).Should(Equal(value))
+	Ω(cfg.Features.DHCP.ServerConfig).Should(Equal(value))
+	Ω(cfg.Features.DHCP.StaticLeases).Should(Equal(value))
+	Ω(cfg.Features.DNS.ServerConfig).Should(Equal(value))
+	Ω(cfg.Features.DNS.AccessLists).Should(Equal(value))
+	Ω(cfg.Features.DNS.Rewrites).Should(Equal(value))
+}
--- a/pkg/config/env.go
+++ b/pkg/config/env.go
@@ -0,0 +1,139 @@
+package config
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/caarlos0/env/v10"
+)
+
+func handleDeprecatedEnvVars(cfg *types.Config) {
+	if val, ok := checkDeprecatedEnvVar("RUNONSTART", "RUN_ON_START"); ok {
+		cfg.RunOnStart, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("API_DARKMODE", "API_DARK_MODE"); ok {
+		cfg.API.DarkMode, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("FEATURES_GENERALSETTINGS", "FEATURES_GENERAL_SETTINGS"); ok {
+		cfg.Features.GeneralSettings, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("FEATURES_QUERYLOGCONFIG", "FEATURES_QUERY_LOG_CONFIG"); ok {
+		cfg.Features.QueryLogConfig, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("FEATURES_STATSCONFIG", "FEATURES_STATS_CONFIG"); ok {
+		cfg.Features.StatsConfig, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("FEATURES_CLIENTSETTINGS", "FEATURES_CLIENT_SETTINGS"); ok {
+		cfg.Features.ClientSettings, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("FEATURES_DHCP_SERVERCONFIG", "FEATURES_DHCP_SERVER_CONFIG"); ok {
+		cfg.Features.DHCP.ServerConfig, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("FEATURES_DHCP_STATICLEASES", "FEATURES_DHCP_STATIC_LEASES"); ok {
+		cfg.Features.DHCP.StaticLeases, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("FEATURES_DNS_ACCESSLISTS", "FEATURES_DNS_ACCESS_LISTS"); ok {
+		cfg.Features.DNS.AccessLists, _ = strconv.ParseBool(val)
+	}
+	if val, ok := checkDeprecatedEnvVar("FEATURES_DNS_SERVERCONFIG", "FEATURES_DNS_SERVER_CONFIG"); ok {
+		cfg.Features.DNS.ServerConfig, _ = strconv.ParseBool(val)
+	}
+
+	if cfg.Replica != nil {
+		if val, ok := checkDeprecatedEnvVar("REPLICA_WEBURL", "REPLICA_WEB_URL"); ok {
+			cfg.Replica.WebURL = val
+		}
+		if val, ok := checkDeprecatedEnvVar("REPLICA_AUTOSETUP", "REPLICA_AUTO_SETUP"); ok {
+			cfg.Replica.AutoSetup, _ = strconv.ParseBool(val)
+		}
+		if val, ok := checkDeprecatedEnvVar("REPLICA_INTERFACENAME", "REPLICA_INTERFACE_NAME"); ok {
+			cfg.Replica.InterfaceName = val
+		}
+		if val, ok := checkDeprecatedEnvVar("REPLICA_DHCPSERVERENABLED", "REPLICA_DHCP_SERVER_ENABLED"); ok {
+			if b, err := strconv.ParseBool(val); err != nil {
+				cfg.Replica.DHCPServerEnabled = utils.Ptr(b)
+			}
+		}
+	}
+}
+
+func checkDeprecatedEnvVar(oldName string, newName string) (string, bool) {
+	old, oldOK := os.LookupEnv(oldName)
+	if oldOK {
+		logger.With("deprecated", oldName, "replacement", newName).
+			Warn("Deprecated env variable is used, please use the correct one")
+	}
+	new, newOK := os.LookupEnv(newName)
+	if newOK {
+		return new, true
+	}
+	return old, oldOK
+}
+
+func checkDeprecatedReplicaEnvVar(oldPattern string, newPattern string, replicaID int) (string, bool) {
+	return checkDeprecatedEnvVar(fmt.Sprintf(oldPattern, replicaID), fmt.Sprintf(newPattern, replicaID))
+}
+
+// Manually collect replicas from env.
+func enrichReplicasFromEnv(initialReplicas []types.AdGuardInstance) ([]types.AdGuardInstance, error) {
+	var replicas []types.AdGuardInstance
+	for _, v := range os.Environ() {
+		if envReplicasURLPattern.MatchString(v) {
+			sm := envReplicasURLPattern.FindStringSubmatch(v)
+			id, _ := strconv.Atoi(sm[1])
+
+			if id <= 0 {
+				return nil, fmt.Errorf("numbered replica env variables must have a number id >= 1, got %q", v)
+			}
+
+			if id > len(initialReplicas) {
+				replicas = append(replicas, types.AdGuardInstance{URL: sm[2]})
+			} else {
+				re := initialReplicas[id-1]
+				re.URL = sm[2]
+				replicas = append(replicas, re)
+			}
+		}
+	}
+
+	if len(replicas) == 0 {
+		replicas = initialReplicas
+	}
+
+	for i := range replicas {
+		reID := i + 1
+
+		if err := env.ParseWithOptions(&replicas[i], env.Options{Prefix: fmt.Sprintf("REPLICA%d_", reID)}); err != nil {
+			return nil, err
+		}
+		if val, ok := checkDeprecatedReplicaEnvVar("REPLICA%d_APIPATH", "REPLICA%d_API_PATH", reID); ok {
+			replicas[i].APIPath = val
+		}
+		if val, ok := checkDeprecatedReplicaEnvVar("REPLICA%d_INSECURESKIPVERIFY", "REPLICA%d_INSECURE_SKIP_VERIFY", reID); ok {
+			replicas[i].InsecureSkipVerify = strings.EqualFold(val, "true")
+		}
+		if val, ok := checkDeprecatedReplicaEnvVar("REPLICA%d_AUTOSETUP", "REPLICA%d_AUTO_SETUP", reID); ok {
+			replicas[i].AutoSetup = strings.EqualFold(val, "true")
+		}
+		if val, ok := checkDeprecatedReplicaEnvVar("REPLICA%d_INTERFACENAME", "REPLICA%d_INTERFACE_NAME", reID); ok {
+			replicas[i].InterfaceName = val
+		}
+
+		if dhcpEnabled, ok := checkDeprecatedReplicaEnvVar("REPLICA%d_DHCPSERVERENABLED", "REPLICA%d_DHCP_SERVER_ENABLED", reID); ok {
+			if strings.EqualFold(dhcpEnabled, "true") {
+				replicas[i].DHCPServerEnabled = utils.Ptr(true)
+			} else if strings.EqualFold(dhcpEnabled, "false") {
+				replicas[i].DHCPServerEnabled = utils.Ptr(false)
+			}
+		}
+		if replicas[i].APIPath == "" {
+			replicas[i].APIPath = "/control"
+		}
+	}
+
+	return replicas, nil
+}
--- a/pkg/config/env_test.go
+++ b/pkg/config/env_test.go
@@ -0,0 +1,25 @@
+package config
+
+import (
+	"os"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Config", func() {
+	Context("env", func() {
+		Context("enrichReplicasFromEnv", func() {
+			It("should have the origin URL from the config env var", func() {
+				_ = os.Setenv("REPLICA0_URL", "https://origin-env:443")
+				defer func() {
+					_ = os.Unsetenv("REPLICA0_URL")
+				}()
+				_, err := enrichReplicasFromEnv(nil)
+
+				Ω(err).Should(HaveOccurred())
+				Ω(err.Error()).Should(ContainSubstring("numbered replica env variables must have a number id >= 1"))
+			})
+		})
+	})
+})
--- a/pkg/config/file.go
+++ b/pkg/config/file.go
@@ -0,0 +1,34 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/bakito/adguardhome-sync/pkg/types"
+	"gopkg.in/yaml.v3"
+)
+
+func readFile(cfg *types.Config, path string) error {
+	if _, err := os.Stat(path); err == nil {
+		b, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		if err := yaml.Unmarshal(b, cfg); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func configFilePath(configFile string) (string, error) {
+	if configFile == "" {
+		// Find home directory.
+		home, err := os.UserHomeDir()
+		if err != nil {
+			return "", err
+		}
+		return filepath.Join(home, ".adguardhome-sync"), nil
+	}
+	return configFile, nil
+}
--- a/pkg/config/file_test.go
+++ b/pkg/config/file_test.go
@@ -0,0 +1,32 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/google/uuid"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Config", func() {
+	var ()
+	BeforeEach(func() {
+	})
+	Context("configFilePath", func() {
+		It("should return the same value", func() {
+			path := uuid.NewString()
+			result, err := configFilePath(path)
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(result).Should(Equal(path))
+		})
+		It("should the file in HOME dir", func() {
+			home := os.Getenv("HOME")
+			result, err := configFilePath("")
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(result).Should(Equal(filepath.Join(home, "/.adguardhome-sync")))
+		})
+	})
+})
--- a/pkg/config/flag-names.go
+++ b/pkg/config/flag-names.go
@@ -0,0 +1,44 @@
+package config
+
+const (
+	FlagCron            = "cron"
+	FlagRunOnStart      = "runOnStart"
+	FlagPrintConfigOnly = "printConfigOnly"
+	FlagContinueOnError = "continueOnError"
+
+	FlagApiPort     = "api-port"
+	FlagApiUsername = "api-username"
+	FlagApiPassword = "api-password"
+	FlagApiDarkMode = "api-dark-mode"
+
+	FlagFeatureDhcpServerConfig = "feature-dhcp-server-config"
+	FlagFeatureDhcpStaticLeases = "feature-dhcp-static-leases"
+	FlagFeatureDnsServerConfig  = "feature-dns-server-config"
+	FlagFeatureDnsAccessLists   = "feature-dns-access-lists"
+	FlagFeatureDnsRewrites      = "feature-dns-rewrites"
+	FlagFeatureGeneral          = "feature-general-settings"
+	FlagFeatureQueryLog         = "feature-query-log-config"
+	FlagFeatureStats            = "feature-stats-config"
+	FlagFeatureClient           = "feature-client-settings"
+	FlagFeatureServices         = "feature-services"
+	FlagFeatureFilters          = "feature-filters"
+
+	FlagOriginURL      = "origin-url"
+	FlagOriginWebURL   = "origin-web-url"
+	FlagOriginApiPath  = "origin-api-path"
+	FlagOriginUsername = "origin-username"
+
+	FlagOriginPassword = "origin-password"
+	FlagOriginCookie   = "origin-cookie"
+	FlagOriginISV      = "origin-insecure-skip-verify"
+
+	FlagReplicaURL           = "replica-url"
+	FlagReplicaWebURL        = "replica-web-url"
+	FlagReplicaApiPath       = "replica-api-path"
+	FlagReplicaUsername      = "replica-username"
+	FlagReplicaPassword      = "replica-password"
+	FlagReplicaCookie        = "replica-cookie"
+	FlagReplicaISV           = "replica-insecure-skip-verify"
+	FlagReplicaAutoSetup     = "replica-auto-setup"
+	FlagReplicaInterfaceName = "replica-interface-name"
+)
--- a/pkg/config/flags.go
+++ b/pkg/config/flags.go
@@ -0,0 +1,283 @@
+package config
+
+import (
+	"github.com/bakito/adguardhome-sync/pkg/types"
+)
+
+func readFlags(cfg *types.Config, flags Flags) error {
+	if flags == nil {
+		return nil
+	}
+
+	fr := &flagReader{
+		cfg:   cfg,
+		flags: flags,
+	}
+
+	if err := fr.readRootFlags(); err != nil {
+		return err
+	}
+
+	if err := fr.readApiFlags(); err != nil {
+		return err
+	}
+
+	if err := fr.readFeatureFlags(); err != nil {
+		return err
+	}
+
+	if err := fr.readOriginFlags(); err != nil {
+		return err
+	}
+
+	if err := fr.readReplicaFlags(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type flagReader struct {
+	cfg   *types.Config
+	flags Flags
+}
+
+func (fr *flagReader) readReplicaFlags() error {
+	if err := fr.setStringFlag(FlagReplicaURL, func(cgf *types.Config, value string) {
+		fr.cfg.Replica.URL = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagReplicaWebURL, func(cgf *types.Config, value string) {
+		fr.cfg.Replica.WebURL = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagReplicaApiPath, func(cgf *types.Config, value string) {
+		fr.cfg.Replica.APIPath = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagReplicaUsername, func(cgf *types.Config, value string) {
+		fr.cfg.Replica.Username = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagReplicaPassword, func(cgf *types.Config, value string) {
+		fr.cfg.Replica.Password = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagReplicaCookie, func(cgf *types.Config, value string) {
+		fr.cfg.Replica.Cookie = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagReplicaISV, func(cgf *types.Config, value bool) {
+		fr.cfg.Replica.InsecureSkipVerify = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagReplicaAutoSetup, func(cgf *types.Config, value bool) {
+		fr.cfg.Replica.AutoSetup = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagReplicaInterfaceName, func(cgf *types.Config, value string) {
+		fr.cfg.Replica.InterfaceName = value
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (fr *flagReader) readOriginFlags() error {
+	if err := fr.setStringFlag(FlagOriginURL, func(cgf *types.Config, value string) {
+		fr.cfg.Origin.URL = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagOriginWebURL, func(cgf *types.Config, value string) {
+		fr.cfg.Origin.WebURL = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagOriginApiPath, func(cgf *types.Config, value string) {
+		fr.cfg.Origin.APIPath = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagOriginUsername, func(cgf *types.Config, value string) {
+		fr.cfg.Origin.Username = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagOriginPassword, func(cgf *types.Config, value string) {
+		fr.cfg.Origin.Password = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setStringFlag(FlagOriginCookie, func(cgf *types.Config, value string) {
+		fr.cfg.Origin.Cookie = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagOriginISV, func(cgf *types.Config, value bool) {
+		fr.cfg.Origin.InsecureSkipVerify = value
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (fr *flagReader) readFeatureFlags() error {
+	if err := fr.setBoolFlag(FlagFeatureDhcpServerConfig, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.DHCP.ServerConfig = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagFeatureDhcpStaticLeases, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.DHCP.StaticLeases = value
+	}); err != nil {
+		return err
+	}
+
+	if err := fr.setBoolFlag(FlagFeatureDnsServerConfig, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.DNS.ServerConfig = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagFeatureDnsAccessLists, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.DNS.AccessLists = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagFeatureDnsRewrites, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.DNS.Rewrites = value
+	}); err != nil {
+		return err
+	}
+
+	if err := fr.setBoolFlag(FlagFeatureGeneral, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.GeneralSettings = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagFeatureQueryLog, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.QueryLogConfig = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagFeatureStats, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.StatsConfig = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagFeatureClient, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.ClientSettings = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagFeatureServices, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.Services = value
+	}); err != nil {
+		return err
+	}
+	if err := fr.setBoolFlag(FlagFeatureFilters, func(cgf *types.Config, value bool) {
+		fr.cfg.Features.Filters = value
+	}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (fr *flagReader) readApiFlags() (err error) {
+	if err = fr.setIntFlag(FlagApiPort, func(cgf *types.Config, value int) {
+		fr.cfg.API.Port = value
+	}); err != nil {
+		return
+	}
+	if err = fr.setStringFlag(FlagApiUsername, func(cgf *types.Config, value string) {
+		fr.cfg.API.Username = value
+	}); err != nil {
+		return
+	}
+	if err = fr.setStringFlag(FlagApiPassword, func(cgf *types.Config, value string) {
+		fr.cfg.API.Password = value
+	}); err != nil {
+		return
+	}
+	if err = fr.setBoolFlag(FlagApiDarkMode, func(cgf *types.Config, value bool) {
+		fr.cfg.API.DarkMode = value
+	}); err != nil {
+		return
+	}
+	return
+}
+
+func (fr *flagReader) readRootFlags() (err error) {
+	if err = fr.setStringFlag(FlagCron, func(cgf *types.Config, value string) {
+		fr.cfg.Cron = value
+	}); err != nil {
+		return
+	}
+	if err = fr.setBoolFlag(FlagRunOnStart, func(cgf *types.Config, value bool) {
+		fr.cfg.RunOnStart = value
+	}); err != nil {
+		return
+	}
+	if err = fr.setBoolFlag(FlagPrintConfigOnly, func(cgf *types.Config, value bool) {
+		fr.cfg.PrintConfigOnly = value
+	}); err != nil {
+		return
+	}
+	if err = fr.setBoolFlag(FlagContinueOnError, func(cgf *types.Config, value bool) {
+		fr.cfg.ContinueOnError = value
+	}); err != nil {
+		return
+	}
+	return
+}
+
+type Flags interface {
+	Changed(name string) bool
+	GetString(name string) (string, error)
+	GetInt(name string) (int, error)
+	GetBool(name string) (bool, error)
+}
+
+func (fr *flagReader) setStringFlag(name string, cb callback[string]) (err error) {
+	if fr.flags.Changed(name) {
+		if value, err := fr.flags.GetString(name); err != nil {
+			return err
+		} else {
+			cb(fr.cfg, value)
+		}
+	}
+	return nil
+}
+
+func (fr *flagReader) setBoolFlag(name string, cb callback[bool]) (err error) {
+	if fr.flags.Changed(name) {
+		if value, err := fr.flags.GetBool(name); err != nil {
+			return err
+		} else {
+			cb(fr.cfg, value)
+		}
+	}
+	return nil
+}
+
+func (fr *flagReader) setIntFlag(name string, cb callback[int]) (err error) {
+	if fr.flags.Changed(name) {
+		if value, err := fr.flags.GetInt(name); err != nil {
+			return err
+		} else {
+			cb(fr.cfg, value)
+		}
+	}
+	return nil
+}
+
+type callback[T any] func(cgf *types.Config, value T)
--- a/pkg/config/flags_test.go
+++ b/pkg/config/flags_test.go
@@ -0,0 +1,235 @@
+package config
+
+import (
+	"strings"
+
+	flagsmock "github.com/bakito/adguardhome-sync/pkg/mocks/flags"
+	"github.com/bakito/adguardhome-sync/pkg/types"
+	gm "github.com/golang/mock/gomock"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Config", func() {
+	var (
+		cfg      *types.Config
+		flags    *flagsmock.MockFlags
+		mockCtrl *gm.Controller
+	)
+	BeforeEach(func() {
+		cfg = &types.Config{
+			Replica: &types.AdGuardInstance{},
+			Features: types.Features{
+				DNS: types.DNS{
+					AccessLists:  true,
+					ServerConfig: true,
+					Rewrites:     true,
+				},
+				DHCP: types.DHCP{
+					ServerConfig: true,
+					StaticLeases: true,
+				},
+				GeneralSettings: true,
+				QueryLogConfig:  true,
+				StatsConfig:     true,
+				ClientSettings:  true,
+				Services:        true,
+				Filters:         true,
+			},
+		}
+		mockCtrl = gm.NewController(GinkgoT())
+		flags = flagsmock.NewMockFlags(mockCtrl)
+	})
+	AfterEach(func() {
+		defer mockCtrl.Finish()
+	})
+	Context("readFlags", func() {
+		It("should not change the config with nil flags", func() {
+			clone := cfg.DeepCopy()
+			err := readFlags(cfg, nil)
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(cfg).Should(Equal(clone))
+		})
+		It("should not change the config with no changed flags", func() {
+			clone := cfg.DeepCopy()
+			flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+			err := readFlags(cfg, flags)
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(cfg).Should(Equal(clone))
+		})
+	})
+	Context("readFeatureFlags", func() {
+		It("should disable all flags", func() {
+			flags.EXPECT().Changed(gm.Any()).DoAndReturn(func(name string) bool {
+				return strings.HasPrefix(name, "feature")
+			}).AnyTimes()
+			flags.EXPECT().GetBool(gm.Any()).Return(false, nil).AnyTimes()
+			err := readFlags(cfg, flags)
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(cfg.Features).Should(Equal(types.Features{
+				DNS: types.DNS{
+					AccessLists:  false,
+					ServerConfig: false,
+					Rewrites:     false,
+				},
+				DHCP: types.DHCP{
+					ServerConfig: false,
+					StaticLeases: false,
+				},
+				GeneralSettings: false,
+				QueryLogConfig:  false,
+				StatsConfig:     false,
+				ClientSettings:  false,
+				Services:        false,
+				Filters:         false,
+			}))
+		})
+	})
+	Context("readApiFlags", func() {
+		It("should change all values", func() {
+			cfg.API = types.API{
+				Port:     1111,
+				Username: "2222",
+				Password: "3333",
+				DarkMode: false,
+			}
+			flags.EXPECT().Changed(gm.Any()).DoAndReturn(func(name string) bool {
+				return strings.HasPrefix(name, "api")
+			}).AnyTimes()
+			flags.EXPECT().GetInt(FlagApiPort).Return(9999, nil)
+			flags.EXPECT().GetString(FlagApiUsername).Return("aaaa", nil)
+			flags.EXPECT().GetString(FlagApiPassword).Return("bbbb", nil)
+			flags.EXPECT().GetBool(FlagApiDarkMode).Return(true, nil)
+			err := readFlags(cfg, flags)
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(cfg.API).Should(Equal(types.API{
+				Port:     9999,
+				Username: "aaaa",
+				Password: "bbbb",
+				DarkMode: true,
+			}))
+		})
+	})
+	Context("readRootFlags", func() {
+		It("should change all values", func() {
+			cfg.Cron = "*/10 * * * *"
+			cfg.PrintConfigOnly = false
+			cfg.ContinueOnError = false
+			cfg.RunOnStart = false
+
+			flags.EXPECT().Changed(FlagCron).Return(true)
+			flags.EXPECT().Changed(FlagRunOnStart).Return(true)
+			flags.EXPECT().Changed(FlagPrintConfigOnly).Return(true)
+			flags.EXPECT().Changed(FlagContinueOnError).Return(true)
+			flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+			flags.EXPECT().GetString(FlagCron).Return("*/30 * * * *", nil)
+			flags.EXPECT().GetBool(FlagRunOnStart).Return(true, nil)
+			flags.EXPECT().GetBool(FlagPrintConfigOnly).Return(true, nil)
+			flags.EXPECT().GetBool(FlagContinueOnError).Return(true, nil)
+			err := readFlags(cfg, flags)
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(cfg.Cron).Should(Equal("*/30 * * * *"))
+			Ω(cfg.RunOnStart).Should(BeTrue())
+			Ω(cfg.PrintConfigOnly).Should(BeTrue())
+			Ω(cfg.ContinueOnError).Should(BeTrue())
+		})
+	})
+	Context("readOriginFlags", func() {
+		It("should change all values", func() {
+			cfg.Origin = types.AdGuardInstance{
+				URL:                "1",
+				WebURL:             "2",
+				APIPath:            "3",
+				Username:           "4",
+				Password:           "5",
+				Cookie:             "6",
+				InsecureSkipVerify: false,
+			}
+
+			flags.EXPECT().Changed(FlagOriginURL).Return(true)
+			flags.EXPECT().Changed(FlagOriginWebURL).Return(true)
+			flags.EXPECT().Changed(FlagOriginApiPath).Return(true)
+			flags.EXPECT().Changed(FlagOriginUsername).Return(true)
+			flags.EXPECT().Changed(FlagOriginPassword).Return(true)
+			flags.EXPECT().Changed(FlagOriginCookie).Return(true)
+			flags.EXPECT().Changed(FlagOriginISV).Return(true)
+			flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+			flags.EXPECT().GetString(FlagOriginURL).Return("a", nil)
+			flags.EXPECT().GetString(FlagOriginWebURL).Return("b", nil)
+			flags.EXPECT().GetString(FlagOriginApiPath).Return("c", nil)
+			flags.EXPECT().GetString(FlagOriginUsername).Return("d", nil)
+			flags.EXPECT().GetString(FlagOriginPassword).Return("e", nil)
+			flags.EXPECT().GetString(FlagOriginCookie).Return("f", nil)
+			flags.EXPECT().GetBool(FlagOriginISV).Return(true, nil)
+			err := readFlags(cfg, flags)
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(cfg.Origin).Should(Equal(types.AdGuardInstance{
+				URL:                "a",
+				WebURL:             "b",
+				APIPath:            "c",
+				Username:           "d",
+				Password:           "e",
+				Cookie:             "f",
+				InsecureSkipVerify: true,
+			}))
+		})
+	})
+	Context("readReplicaFlags", func() {
+		It("should change all values", func() {
+			cfg.Replica = &types.AdGuardInstance{
+				URL:                "1",
+				WebURL:             "2",
+				APIPath:            "3",
+				Username:           "4",
+				Password:           "5",
+				Cookie:             "6",
+				InsecureSkipVerify: false,
+				AutoSetup:          false,
+				InterfaceName:      "7",
+			}
+
+			flags.EXPECT().Changed(FlagReplicaURL).Return(true)
+			flags.EXPECT().Changed(FlagReplicaWebURL).Return(true)
+			flags.EXPECT().Changed(FlagReplicaApiPath).Return(true)
+			flags.EXPECT().Changed(FlagReplicaUsername).Return(true)
+			flags.EXPECT().Changed(FlagReplicaPassword).Return(true)
+			flags.EXPECT().Changed(FlagReplicaCookie).Return(true)
+			flags.EXPECT().Changed(FlagReplicaISV).Return(true)
+			flags.EXPECT().Changed(FlagReplicaAutoSetup).Return(true)
+			flags.EXPECT().Changed(FlagReplicaInterfaceName).Return(true)
+			flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+			flags.EXPECT().GetString(FlagReplicaURL).Return("a", nil)
+			flags.EXPECT().GetString(FlagReplicaWebURL).Return("b", nil)
+			flags.EXPECT().GetString(FlagReplicaApiPath).Return("c", nil)
+			flags.EXPECT().GetString(FlagReplicaUsername).Return("d", nil)
+			flags.EXPECT().GetString(FlagReplicaPassword).Return("e", nil)
+			flags.EXPECT().GetString(FlagReplicaCookie).Return("f", nil)
+			flags.EXPECT().GetBool(FlagReplicaISV).Return(true, nil)
+			flags.EXPECT().GetBool(FlagReplicaAutoSetup).Return(true, nil)
+			flags.EXPECT().GetString(FlagReplicaInterfaceName).Return("g", nil)
+			err := readFlags(cfg, flags)
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(cfg.Replica).Should(Equal(&types.AdGuardInstance{
+				URL:                "a",
+				WebURL:             "b",
+				APIPath:            "c",
+				Username:           "d",
+				Password:           "e",
+				Cookie:             "f",
+				InsecureSkipVerify: true,
+				AutoSetup:          true,
+				InterfaceName:      "g",
+			}))
+		})
+	})
+})
--- a/pkg/mocks/client/mock.go
+++ b/pkg/mocks/client/mock.go
@@ -49,59 +49,46 @@ func (mr *MockClientMockRecorder) AccessList() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AccessList", reflect.TypeOf((*MockClient)(nil).AccessList))
 }

-// AddClients mocks base method.
-func (m *MockClient) AddClients(arg0 ...*model.Client) error {
+// AddClient mocks base method.
+func (m *MockClient) AddClient(arg0 *model.Client) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{}
-	for _, a := range arg0 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "AddClients", varargs...)
+	ret := m.ctrl.Call(m, "AddClient", arg0)
 	ret0, _ := ret[0].(error)
 	return ret0
 }

-// AddClients indicates an expected call of AddClients.
-func (mr *MockClientMockRecorder) AddClients(arg0 ...interface{}) *gomock.Call {
+// AddClient indicates an expected call of AddClient.
+func (mr *MockClientMockRecorder) AddClient(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddClients", reflect.TypeOf((*MockClient)(nil).AddClients), arg0...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddClient", reflect.TypeOf((*MockClient)(nil).AddClient), arg0)
 }

-// AddDHCPStaticLeases mocks base method.
-func (m *MockClient) AddDHCPStaticLeases(arg0 ...model.DhcpStaticLease) error {
+// AddDHCPStaticLease mocks base method.
+func (m *MockClient) AddDHCPStaticLease(arg0 model.DhcpStaticLease) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{}
-	for _, a := range arg0 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "AddDHCPStaticLeases", varargs...)
+	ret := m.ctrl.Call(m, "AddDHCPStaticLease", arg0)
 	ret0, _ := ret[0].(error)
 	return ret0
 }

-// AddDHCPStaticLeases indicates an expected call of AddDHCPStaticLeases.
-func (mr *MockClientMockRecorder) AddDHCPStaticLeases(arg0 ...interface{}) *gomock.Call {
+// AddDHCPStaticLease indicates an expected call of AddDHCPStaticLease.
+func (mr *MockClientMockRecorder) AddDHCPStaticLease(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddDHCPStaticLeases", reflect.TypeOf((*MockClient)(nil).AddDHCPStaticLeases), arg0...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddDHCPStaticLease", reflect.TypeOf((*MockClient)(nil).AddDHCPStaticLease), arg0)
 }

-// AddFilters mocks base method.
-func (m *MockClient) AddFilters(arg0 bool, arg1 ...model.Filter) error {
+// AddFilter mocks base method.
+func (m *MockClient) AddFilter(arg0 bool, arg1 model.Filter) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0}
-	for _, a := range arg1 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "AddFilters", varargs...)
+	ret := m.ctrl.Call(m, "AddFilter", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
 }

-// AddFilters indicates an expected call of AddFilters.
-func (mr *MockClientMockRecorder) AddFilters(arg0 interface{}, arg1 ...interface{}) *gomock.Call {
+// AddFilter indicates an expected call of AddFilter.
+func (mr *MockClientMockRecorder) AddFilter(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0}, arg1...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddFilters", reflect.TypeOf((*MockClient)(nil).AddFilters), varargs...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddFilter", reflect.TypeOf((*MockClient)(nil).AddFilter), arg0, arg1)
 }

 // AddRewriteEntries mocks base method.
@@ -182,59 +169,46 @@ func (mr *MockClientMockRecorder) DNSConfig() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DNSConfig", reflect.TypeOf((*MockClient)(nil).DNSConfig))
 }

-// DeleteClients mocks base method.
-func (m *MockClient) DeleteClients(arg0 ...*model.Client) error {
+// DeleteClient mocks base method.
+func (m *MockClient) DeleteClient(arg0 *model.Client) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{}
-	for _, a := range arg0 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "DeleteClients", varargs...)
+	ret := m.ctrl.Call(m, "DeleteClient", arg0)
 	ret0, _ := ret[0].(error)
 	return ret0
 }

-// DeleteClients indicates an expected call of DeleteClients.
-func (mr *MockClientMockRecorder) DeleteClients(arg0 ...interface{}) *gomock.Call {
+// DeleteClient indicates an expected call of DeleteClient.
+func (mr *MockClientMockRecorder) DeleteClient(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteClients", reflect.TypeOf((*MockClient)(nil).DeleteClients), arg0...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteClient", reflect.TypeOf((*MockClient)(nil).DeleteClient), arg0)
 }

-// DeleteDHCPStaticLeases mocks base method.
-func (m *MockClient) DeleteDHCPStaticLeases(arg0 ...model.DhcpStaticLease) error {
+// DeleteDHCPStaticLease mocks base method.
+func (m *MockClient) DeleteDHCPStaticLease(arg0 model.DhcpStaticLease) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{}
-	for _, a := range arg0 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "DeleteDHCPStaticLeases", varargs...)
+	ret := m.ctrl.Call(m, "DeleteDHCPStaticLease", arg0)
 	ret0, _ := ret[0].(error)
 	return ret0
 }

-// DeleteDHCPStaticLeases indicates an expected call of DeleteDHCPStaticLeases.
-func (mr *MockClientMockRecorder) DeleteDHCPStaticLeases(arg0 ...interface{}) *gomock.Call {
+// DeleteDHCPStaticLease indicates an expected call of DeleteDHCPStaticLease.
+func (mr *MockClientMockRecorder) DeleteDHCPStaticLease(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDHCPStaticLeases", reflect.TypeOf((*MockClient)(nil).DeleteDHCPStaticLeases), arg0...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDHCPStaticLease", reflect.TypeOf((*MockClient)(nil).DeleteDHCPStaticLease), arg0)
 }

-// DeleteFilters mocks base method.
-func (m *MockClient) DeleteFilters(arg0 bool, arg1 ...model.Filter) error {
+// DeleteFilter mocks base method.
+func (m *MockClient) DeleteFilter(arg0 bool, arg1 model.Filter) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0}
-	for _, a := range arg1 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "DeleteFilters", varargs...)
+	ret := m.ctrl.Call(m, "DeleteFilter", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
 }

-// DeleteFilters indicates an expected call of DeleteFilters.
-func (mr *MockClientMockRecorder) DeleteFilters(arg0 interface{}, arg1 ...interface{}) *gomock.Call {
+// DeleteFilter indicates an expected call of DeleteFilter.
+func (mr *MockClientMockRecorder) DeleteFilter(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0}, arg1...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteFilters", reflect.TypeOf((*MockClient)(nil).DeleteFilters), varargs...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteFilter", reflect.TypeOf((*MockClient)(nil).DeleteFilter), arg0, arg1)
 }

 // DeleteRewriteEntries mocks base method.
@@ -643,39 +617,30 @@ func (mr *MockClientMockRecorder) ToggleSafeBrowsing(arg0 interface{}) *gomock.C
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleSafeBrowsing", reflect.TypeOf((*MockClient)(nil).ToggleSafeBrowsing), arg0)
 }

-// UpdateClients mocks base method.
-func (m *MockClient) UpdateClients(arg0 ...*model.Client) error {
+// UpdateClient mocks base method.
+func (m *MockClient) UpdateClient(arg0 *model.Client) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{}
-	for _, a := range arg0 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "UpdateClients", varargs...)
+	ret := m.ctrl.Call(m, "UpdateClient", arg0)
 	ret0, _ := ret[0].(error)
 	return ret0
 }

-// UpdateClients indicates an expected call of UpdateClients.
-func (mr *MockClientMockRecorder) UpdateClients(arg0 ...interface{}) *gomock.Call {
+// UpdateClient indicates an expected call of UpdateClient.
+func (mr *MockClientMockRecorder) UpdateClient(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateClients", reflect.TypeOf((*MockClient)(nil).UpdateClients), arg0...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateClient", reflect.TypeOf((*MockClient)(nil).UpdateClient), arg0)
 }

-// UpdateFilters mocks base method.
-func (m *MockClient) UpdateFilters(arg0 bool, arg1 ...model.Filter) error {
+// UpdateFilter mocks base method.
+func (m *MockClient) UpdateFilter(arg0 bool, arg1 model.Filter) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0}
-	for _, a := range arg1 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "UpdateFilters", varargs...)
+	ret := m.ctrl.Call(m, "UpdateFilter", arg0, arg1)
 	ret0, _ := ret[0].(error)
 	return ret0
 }

-// UpdateFilters indicates an expected call of UpdateFilters.
-func (mr *MockClientMockRecorder) UpdateFilters(arg0 interface{}, arg1 ...interface{}) *gomock.Call {
+// UpdateFilter indicates an expected call of UpdateFilter.
+func (mr *MockClientMockRecorder) UpdateFilter(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0}, arg1...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFilters", reflect.TypeOf((*MockClient)(nil).UpdateFilters), varargs...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFilter", reflect.TypeOf((*MockClient)(nil).UpdateFilter), arg0, arg1)
 }
--- a/pkg/mocks/flags/mock.go
+++ b/pkg/mocks/flags/mock.go
@@ -0,0 +1,93 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/bakito/adguardhome-sync/pkg/config (interfaces: Flags)
+
+// Package client is a generated GoMock package.
+package client
+
+import (
+	reflect "reflect"
+
+	gomock "github.com/golang/mock/gomock"
+)
+
+// MockFlags is a mock of Flags interface.
+type MockFlags struct {
+	ctrl     *gomock.Controller
+	recorder *MockFlagsMockRecorder
+}
+
+// MockFlagsMockRecorder is the mock recorder for MockFlags.
+type MockFlagsMockRecorder struct {
+	mock *MockFlags
+}
+
+// NewMockFlags creates a new mock instance.
+func NewMockFlags(ctrl *gomock.Controller) *MockFlags {
+	mock := &MockFlags{ctrl: ctrl}
+	mock.recorder = &MockFlagsMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockFlags) EXPECT() *MockFlagsMockRecorder {
+	return m.recorder
+}
+
+// Changed mocks base method.
+func (m *MockFlags) Changed(arg0 string) bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Changed", arg0)
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// Changed indicates an expected call of Changed.
+func (mr *MockFlagsMockRecorder) Changed(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Changed", reflect.TypeOf((*MockFlags)(nil).Changed), arg0)
+}
+
+// GetBool mocks base method.
+func (m *MockFlags) GetBool(arg0 string) (bool, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetBool", arg0)
+	ret0, _ := ret[0].(bool)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetBool indicates an expected call of GetBool.
+func (mr *MockFlagsMockRecorder) GetBool(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBool", reflect.TypeOf((*MockFlags)(nil).GetBool), arg0)
+}
+
+// GetInt mocks base method.
+func (m *MockFlags) GetInt(arg0 string) (int, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetInt", arg0)
+	ret0, _ := ret[0].(int)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetInt indicates an expected call of GetInt.
+func (mr *MockFlagsMockRecorder) GetInt(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInt", reflect.TypeOf((*MockFlags)(nil).GetInt), arg0)
+}
+
+// GetString mocks base method.
+func (m *MockFlags) GetString(arg0 string) (string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetString", arg0)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetString indicates an expected call of GetString.
+func (mr *MockFlagsMockRecorder) GetString(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetString", reflect.TypeOf((*MockFlags)(nil).GetString), arg0)
+}
--- a/pkg/sync/action-general.go
+++ b/pkg/sync/action-general.go
@@ -0,0 +1,283 @@
+package sync
+
+import (
+	"github.com/bakito/adguardhome-sync/pkg/client"
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"go.uber.org/zap"
+)
+
+var (
+	actionProfileInfo = func(ac *actionContext) error {
+		if pro, err := ac.client.ProfileInfo(); err != nil {
+			return err
+		} else if merged := pro.ShouldSyncFor(ac.origin.profileInfo); merged != nil {
+			return ac.client.SetProfileInfo(merged)
+		}
+		return nil
+	}
+	actionProtection = func(ac *actionContext) error {
+		if ac.origin.status.ProtectionEnabled != ac.replicaStatus.ProtectionEnabled {
+			return ac.client.ToggleProtection(ac.origin.status.ProtectionEnabled)
+		}
+		return nil
+	}
+	actionParental = func(ac *actionContext) error {
+		if rp, err := ac.client.Parental(); err != nil {
+			return err
+		} else if ac.origin.parental != rp {
+			return ac.client.ToggleParental(ac.origin.parental)
+		}
+		return nil
+	}
+	actionSafeSearchConfig = func(ac *actionContext) error {
+		if ssc, err := ac.client.SafeSearchConfig(); err != nil {
+			return err
+		} else if !ac.origin.safeSearch.Equals(ssc) {
+			return ac.client.SetSafeSearchConfig(ac.origin.safeSearch)
+		}
+		return nil
+	}
+	actionSafeBrowsing = func(ac *actionContext) error {
+		if rs, err := ac.client.SafeBrowsing(); err != nil {
+			return err
+		} else if ac.origin.safeBrowsing != rs {
+			if err = ac.client.ToggleSafeBrowsing(ac.origin.safeBrowsing); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	actionQueryLogConfig = func(ac *actionContext) error {
+		qlc, err := ac.client.QueryLogConfig()
+		if err != nil {
+			return err
+		}
+		if !ac.origin.queryLogConfig.Equals(qlc) {
+			return ac.client.SetQueryLogConfig(ac.origin.queryLogConfig)
+		}
+		return nil
+	}
+	actionStatsConfig = func(ac *actionContext) error {
+		sc, err := ac.client.StatsConfig()
+		if err != nil {
+			return err
+		}
+		if ac.origin.statsConfig.Interval != sc.Interval {
+			return ac.client.SetStatsConfig(ac.origin.statsConfig)
+		}
+		return nil
+	}
+	actionDNSRewrites = func(ac *actionContext) error {
+		replicaRewrites, err := ac.client.RewriteList()
+		if err != nil {
+			return err
+		}
+
+		a, r, d := replicaRewrites.Merge(ac.origin.rewrites)
+
+		if err = ac.client.DeleteRewriteEntries(r...); err != nil {
+			return err
+		}
+		if err = ac.client.AddRewriteEntries(a...); err != nil {
+			return err
+		}
+
+		for _, dupl := range d {
+			ac.rl.With("domain", dupl.Domain, "answer", dupl.Answer).Warn("Skipping duplicated rewrite from source")
+		}
+		return nil
+	}
+	actionFilters = func(ac *actionContext) error {
+		rf, err := ac.client.Filtering()
+		if err != nil {
+			return err
+		}
+
+		if err = syncFilterType(ac.rl, ac.origin.filters.Filters, rf.Filters, false, ac.client, ac.continueOnError); err != nil {
+			return err
+		}
+		if err = syncFilterType(ac.rl, ac.origin.filters.WhitelistFilters, rf.WhitelistFilters, true, ac.client, ac.continueOnError); err != nil {
+			return err
+		}
+
+		if utils.PtrToString(ac.origin.filters.UserRules) != utils.PtrToString(rf.UserRules) {
+			return ac.client.SetCustomRules(ac.origin.filters.UserRules)
+		}
+
+		if ac.origin.filters.Enabled != rf.Enabled || ac.origin.filters.Interval != rf.Interval {
+			return ac.client.ToggleFiltering(*ac.origin.filters.Enabled, *ac.origin.filters.Interval)
+		}
+		return nil
+	}
+
+	actionBlockedServices = func(ac *actionContext) error {
+		rs, err := ac.client.BlockedServices()
+		if err != nil {
+			return err
+		}
+
+		if !model.EqualsStringSlice(ac.origin.blockedServices, rs, true) {
+			return ac.client.SetBlockedServices(ac.origin.blockedServices)
+		}
+		return nil
+	}
+	actionBlockedServicesSchedule = func(ac *actionContext) error {
+		rbss, err := ac.client.BlockedServicesSchedule()
+		if err != nil {
+			return err
+		}
+
+		if !ac.origin.blockedServicesSchedule.Equals(rbss) {
+			return ac.client.SetBlockedServicesSchedule(ac.origin.blockedServicesSchedule)
+		}
+		return nil
+	}
+	actionClientSettings = func(ac *actionContext) error {
+		rc, err := ac.client.Clients()
+		if err != nil {
+			return err
+		}
+
+		a, u, r := rc.Merge(ac.origin.clients)
+
+		for _, client := range r {
+			if err := ac.client.DeleteClient(client); err != nil {
+				ac.rl.With("client-name", client.Name, "error", err).Error("error deleting client setting")
+				if !ac.continueOnError {
+					return err
+				}
+			}
+		}
+
+		for _, client := range a {
+			if err := ac.client.AddClient(client); err != nil {
+				ac.rl.With("client-name", client.Name, "error", err).Error("error adding client setting")
+				if !ac.continueOnError {
+					return err
+				}
+			}
+		}
+
+		for _, client := range u {
+			if err := ac.client.UpdateClient(client); err != nil {
+				ac.rl.With("client-name", client.Name, "error", err).Error("error updating client setting")
+				if !ac.continueOnError {
+					return err
+				}
+			}
+		}
+
+		return nil
+	}
+
+	actionDNSAccessLists = func(ac *actionContext) error {
+		al, err := ac.client.AccessList()
+		if err != nil {
+			return err
+		}
+		if !al.Equals(ac.origin.accessList) {
+			return ac.client.SetAccessList(ac.origin.accessList)
+		}
+		return nil
+	}
+	actionDNSServerConfig = func(ac *actionContext) error {
+		dc, err := ac.client.DNSConfig()
+		if err != nil {
+			return err
+		}
+		if !dc.Equals(ac.origin.dnsConfig) {
+			if err = ac.client.SetDNSConfig(ac.origin.dnsConfig); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+	actionDHCPServerConfig = func(ac *actionContext) error {
+		if ac.origin.dhcpServerConfig.HasConfig() {
+			sc, err := ac.client.DhcpConfig()
+			if err != nil {
+				return err
+			}
+			origClone := ac.origin.dhcpServerConfig.Clone()
+			if ac.replica.InterfaceName != "" {
+				// overwrite interface name
+				origClone.InterfaceName = utils.Ptr(ac.replica.InterfaceName)
+			}
+			if ac.replica.DHCPServerEnabled != nil {
+				// overwrite dhcp enabled
+				origClone.Enabled = ac.replica.DHCPServerEnabled
+			}
+
+			if !sc.CleanAndEquals(origClone) {
+				return ac.client.SetDhcpConfig(origClone)
+			}
+		}
+		return nil
+	}
+	actionDHCPStaticLeases = func(ac *actionContext) error {
+		sc, err := ac.client.DhcpConfig()
+		if err != nil {
+			return err
+		}
+
+		a, r := model.MergeDhcpStaticLeases(sc.StaticLeases, ac.origin.dhcpServerConfig.StaticLeases)
+
+		for _, lease := range r {
+			if err := ac.client.DeleteDHCPStaticLease(lease); err != nil {
+				ac.rl.With("hostname", lease.Hostname, "error", err).Error("error deleting dhcp static lease")
+				if !ac.continueOnError {
+					return err
+				}
+			}
+		}
+
+		for _, lease := range a {
+			if err := ac.client.AddDHCPStaticLease(lease); err != nil {
+				ac.rl.With("hostname", lease.Hostname, "error", err).Error("error adding dhcp static lease")
+				if !ac.continueOnError {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+)
+
+func syncFilterType(rl *zap.SugaredLogger, of *[]model.Filter, rFilters *[]model.Filter, whitelist bool, replica client.Client, continueOnError bool) error {
+	fa, fu, fd := model.MergeFilters(rFilters, of)
+
+	for _, f := range fd {
+		if err := replica.DeleteFilter(whitelist, f); err != nil {
+			rl.With("filter", f.Name, "url", f.Url, "whitelist", whitelist, "error", err).Error("error deleting filter")
+			if !continueOnError {
+				return err
+			}
+		}
+	}
+
+	for _, f := range fa {
+		if err := replica.AddFilter(whitelist, f); err != nil {
+			rl.With("filter", f.Name, "url", f.Url, "whitelist", whitelist, "error", err).Error("error adding filter")
+			if !continueOnError {
+				return err
+			}
+		}
+	}
+
+	for _, f := range fu {
+		if err := replica.UpdateFilter(whitelist, f); err != nil {
+			rl.With("filter", f.Name, "url", f.Url, "whitelist", whitelist, "error", err).Error("error updating filter")
+			if !continueOnError {
+				return err
+			}
+		}
+	}
+
+	if len(fa) > 0 || len(fu) > 0 {
+		if err := replica.RefreshFilters(whitelist); err != nil {
+			return err
+		}
+	}
+	return nil
+}
--- a/pkg/sync/action.go
+++ b/pkg/sync/action.go
@@ -0,0 +1,104 @@
+package sync
+
+import (
+	"github.com/bakito/adguardhome-sync/pkg/client"
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/bakito/adguardhome-sync/pkg/types"
+	"go.uber.org/zap"
+)
+
+func setupActions(cfg *types.Config) (actions []syncAction) {
+	if cfg.Features.GeneralSettings {
+		actions = append(actions,
+			action("profile info", actionProfileInfo),
+			action("protection", actionProtection),
+			action("parental", actionParental),
+			action("safe search config", actionSafeSearchConfig),
+			action("safe browsing", actionSafeBrowsing),
+		)
+	}
+	if cfg.Features.QueryLogConfig {
+		actions = append(actions,
+			action("query log config", actionQueryLogConfig),
+		)
+	}
+	if cfg.Features.StatsConfig {
+		actions = append(actions,
+			action("stats config", actionStatsConfig),
+		)
+	}
+	if cfg.Features.DNS.Rewrites {
+		actions = append(actions,
+			action("DNS rewrites", actionDNSRewrites),
+		)
+	}
+	if cfg.Features.Filters {
+		actions = append(actions,
+			action("actionFilters", actionFilters),
+		)
+	}
+	if cfg.Features.Services {
+		actions = append(actions,
+			action("blocked services", actionBlockedServices),
+			action("blocked services schedule", actionBlockedServicesSchedule),
+		)
+	}
+	if cfg.Features.ClientSettings {
+		actions = append(actions,
+			action("client settings", actionClientSettings),
+		)
+	}
+	if cfg.Features.DNS.AccessLists {
+		actions = append(actions,
+			action("DNS access lists", actionDNSAccessLists),
+		)
+	}
+
+	if cfg.Features.DNS.ServerConfig {
+		actions = append(actions,
+			action("DNS server config", actionDNSServerConfig),
+		)
+	}
+	if cfg.Features.DHCP.ServerConfig {
+		actions = append(actions,
+			action("DHCP server config", actionDHCPServerConfig),
+		)
+	}
+	if cfg.Features.DHCP.StaticLeases {
+		actions = append(actions,
+			action("DHCP static leases", actionDHCPStaticLeases),
+		)
+	}
+	return actions
+}
+
+type syncAction interface {
+	sync(ac *actionContext) error
+	name() string
+}
+
+type actionContext struct {
+	rl              *zap.SugaredLogger
+	origin          *origin
+	client          client.Client
+	replicaStatus   *model.ServerStatus
+	continueOnError bool
+	replica         types.AdGuardInstance
+}
+
+type defaultAction struct {
+	myName string
+	doSync func(ac *actionContext) error
+}
+
+func action(name string, f func(ac *actionContext) error) syncAction {
+	return &defaultAction{myName: name, doSync: f}
+}
+
+func (d *defaultAction) sync(ac *actionContext) error {
+	return d.doSync(ac)
+}
+
+func (d *defaultAction) name() string {
+	return d.myName
+}
--- a/pkg/sync/sync.go
+++ b/pkg/sync/sync.go
@@ -90,6 +90,7 @@ type worker struct {
 	running      bool
 	cron         *cron.Cron
 	createClient func(instance types.AdGuardInstance) (client.Client, error)
+	actions      []syncAction
 }

 func (w *worker) status() *syncStatus {
@@ -112,27 +113,32 @@ func (w *worker) status() *syncStatus {
 	return syncStatus
 }

-func (w *worker) getStatus(inst types.AdGuardInstance) replicaStatus {
+func (w *worker) getStatus(inst types.AdGuardInstance) (st replicaStatus) {
+	st = replicaStatus{Host: inst.WebHost, URL: inst.WebURL}
+
 	oc, err := w.createClient(inst)
 	if err != nil {
 		l.With("error", err, "url", w.cfg.Origin.URL).Error("Error creating origin client")
-		return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "danger"}
+		st.Status = "danger"
+		st.Error = err.Error()
+		return
 	}
-	sl := l.With("from", oc.Host())
-	st, err := oc.Status()
+	sl := l.With("from", inst.WebHost)
+	status, err := oc.Status()
 	if err != nil {
 		if errors.Is(err, client.ErrSetupNeeded) {
-			return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "warning"}
+			st.Status = "warning"
+			st.Error = err.Error()
+			return
 		}
 		sl.With("error", err).Error("Error getting origin status")
-		return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "danger"}
-	}
-	return replicaStatus{
-		Host:              oc.Host(),
-		URL:               inst.URL,
-		Status:            "success",
-		ProtectionEnabled: utils.Ptr(st.ProtectionEnabled),
+		st.Status = "danger"
+		st.Error = err.Error()
+		return
 	}
+	st.Status = "success"
+	st.ProtectionEnabled = utils.Ptr(status.ProtectionEnabled)
+	return
 }

 func (w *worker) sync() {
@@ -207,7 +213,7 @@ func (w *worker) sync() {

 	o.filters, err = oc.Filtering()
 	if err != nil {
-		sl.With("error", err).Error("Error getting origin filters")
+		sl.With("error", err).Error("Error getting origin actionFilters")
 		return
 	}
 	o.clients, err = oc.Clients()
@@ -246,6 +252,8 @@ func (w *worker) sync() {
 		}
 	}

+	w.actions = setupActions(w.cfg)
+
 	replicas := w.cfg.UniqueReplicas()
 	for _, replica := range replicas {
 		w.syncTo(sl, o, replica)
@@ -262,66 +270,37 @@ func (w *worker) syncTo(l *zap.SugaredLogger, o *origin, replica types.AdGuardIn
 	rl := l.With("to", rc.Host())
 	rl.Info("Start sync")

-	rs, err := w.statusWithSetup(rl, replica, rc)
+	replicaStatus, err := w.statusWithSetup(rl, replica, rc)
 	if err != nil {
 		rl.With("error", err).Error("Error getting replica status")
 		return
 	}

-	rl.With("version", rs.Version).Info("Connected to replica")
+	rl.With("version", replicaStatus.Version).Info("Connected to replica")

-	if versions.IsNewerThan(versions.MinAgh, rs.Version) {
-		rl.With("error", err, "version", rs.Version).Errorf("Replica AdGuard Home version must be >= %s", versions.MinAgh)
+	if versions.IsNewerThan(versions.MinAgh, replicaStatus.Version) {
+		rl.With("error", err, "version", replicaStatus.Version).Errorf("Replica AdGuard Home version must be >= %s", versions.MinAgh)
 		return
 	}

-	if o.status.Version != rs.Version {
-		rl.With("originVersion", o.status.Version, "replicaVersion", rs.Version).Warn("Versions do not match")
+	if o.status.Version != replicaStatus.Version {
+		rl.With("originVersion", o.status.Version, "replicaVersion", replicaStatus.Version).Warn("Versions do not match")
 	}

-	err = w.syncGeneralSettings(o, rs, rc)
-	if err != nil {
-		rl.With("error", err).Error("Error syncing general settings")
-		return
+	ac := &actionContext{
+		continueOnError: w.cfg.ContinueOnError,
+		rl:              rl,
+		origin:          o,
+		replicaStatus:   replicaStatus,
+		client:          rc,
+		replica:         replica,
 	}
-
-	err = w.syncConfigs(o, rc)
-	if err != nil {
-		rl.With("error", err).Error("Error syncing configs")
-		return
-	}
-
-	err = w.syncRewrites(rl, o.rewrites, rc)
-	if err != nil {
-		rl.With("error", err).Error("Error syncing rewrites")
-		return
-	}
-	err = w.syncFilters(o.filters, rc)
-	if err != nil {
-		rl.With("error", err).Error("Error syncing filters")
-		return
-	}
-
-	err = w.syncServices(o.blockedServices, o.blockedServicesSchedule, rc)
-	if err != nil {
-		rl.With("error", err).Error("Error syncing blockedServices")
-		return
-	}
-
-	if err = w.syncClients(o.clients, rc); err != nil {
-		rl.With("error", err).Error("Error syncing clients")
-		return
-	}
-
-	if err = w.syncDNS(o.accessList, o.dnsConfig, rc); err != nil {
-		rl.With("error", err).Error("Error syncing dns")
-		return
-	}
-
-	if w.cfg.Features.DHCP.ServerConfig || w.cfg.Features.DHCP.StaticLeases {
-		if err = w.syncDHCPServer(o.dhcpServerConfig, rc, replica); err != nil {
-			rl.With("error", err).Error("Error syncing dhcp")
-			return
+	for _, action := range w.actions {
+		if err := action.sync(ac); err != nil {
+			rl.With("error", err).Errorf("Error syncing %s", action.name())
+			if !w.cfg.ContinueOnError {
+				return
+			}
 		}
 	}

@@ -343,260 +322,6 @@ func (w *worker) statusWithSetup(rl *zap.SugaredLogger, replica types.AdGuardIns
 	return rs, err
 }

-func (w *worker) syncServices(os *model.BlockedServicesArray, obss *model.BlockedServicesSchedule, replica client.Client) error {
-	if w.cfg.Features.Services {
-		rs, err := replica.BlockedServices()
-		if err != nil {
-			return err
-		}
-
-		if !model.EqualsStringSlice(os, rs, true) {
-			if err := replica.SetBlockedServices(os); err != nil {
-				return err
-			}
-		}
-
-		rbss, err := replica.BlockedServicesSchedule()
-		if err != nil {
-			return err
-		}
-
-		if !obss.Equals(rbss) {
-			if err := replica.SetBlockedServicesSchedule(obss); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (w *worker) syncFilters(of *model.FilterStatus, replica client.Client) error {
-	if w.cfg.Features.Filters {
-		rf, err := replica.Filtering()
-		if err != nil {
-			return err
-		}
-
-		if err = w.syncFilterType(of.Filters, rf.Filters, false, replica); err != nil {
-			return err
-		}
-		if err = w.syncFilterType(of.WhitelistFilters, rf.WhitelistFilters, true, replica); err != nil {
-			return err
-		}
-
-		if utils.PtrToString(of.UserRules) != utils.PtrToString(rf.UserRules) {
-			return replica.SetCustomRules(of.UserRules)
-		}
-
-		if of.Enabled != rf.Enabled || of.Interval != rf.Interval {
-			if err = replica.ToggleFiltering(*of.Enabled, *of.Interval); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (w *worker) syncFilterType(of *[]model.Filter, rFilters *[]model.Filter, whitelist bool, replica client.Client) error {
-	fa, fu, fd := model.MergeFilters(rFilters, of)
-
-	if err := replica.DeleteFilters(whitelist, fd...); err != nil {
-		return err
-	}
-	if err := replica.AddFilters(whitelist, fa...); err != nil {
-		return err
-	}
-	if err := replica.UpdateFilters(whitelist, fu...); err != nil {
-		return err
-	}
-
-	if len(fa) > 0 || len(fu) > 0 {
-		if err := replica.RefreshFilters(whitelist); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (w *worker) syncRewrites(rl *zap.SugaredLogger, or *model.RewriteEntries, replica client.Client) error {
-	if w.cfg.Features.DNS.Rewrites {
-		replicaRewrites, err := replica.RewriteList()
-		if err != nil {
-			return err
-		}
-
-		a, r, d := replicaRewrites.Merge(or)
-
-		if err = replica.DeleteRewriteEntries(r...); err != nil {
-			return err
-		}
-		if err = replica.AddRewriteEntries(a...); err != nil {
-			return err
-		}
-
-		for _, dupl := range d {
-			rl.With("domain", dupl.Domain, "answer", dupl.Answer).Warn("Skipping duplicated rewrite from source")
-		}
-	}
-
-	return nil
-}
-
-func (w *worker) syncClients(oc *model.Clients, replica client.Client) error {
-	if w.cfg.Features.ClientSettings {
-		rc, err := replica.Clients()
-		if err != nil {
-			return err
-		}
-
-		a, u, r := rc.Merge(oc)
-
-		if err = replica.DeleteClients(r...); err != nil {
-			return err
-		}
-		if err = replica.AddClients(a...); err != nil {
-			return err
-		}
-		if err = replica.UpdateClients(u...); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (w *worker) syncGeneralSettings(o *origin, rs *model.ServerStatus, replica client.Client) error {
-	if w.cfg.Features.GeneralSettings {
-
-		if pro, err := replica.ProfileInfo(); err != nil {
-			return err
-		} else if merged := pro.ShouldSyncFor(o.profileInfo); merged != nil {
-			if err = replica.SetProfileInfo(merged); err != nil {
-				return err
-			}
-		}
-
-		if o.status.ProtectionEnabled != rs.ProtectionEnabled {
-			if err := replica.ToggleProtection(o.status.ProtectionEnabled); err != nil {
-				return err
-			}
-		}
-		if rp, err := replica.Parental(); err != nil {
-			return err
-		} else if o.parental != rp {
-			if err = replica.ToggleParental(o.parental); err != nil {
-				return err
-			}
-		}
-		if ssc, err := replica.SafeSearchConfig(); err != nil {
-			return err
-		} else if !o.safeSearch.Equals(ssc) {
-			if err = replica.SetSafeSearchConfig(o.safeSearch); err != nil {
-				return err
-			}
-		}
-		if rs, err := replica.SafeBrowsing(); err != nil {
-			return err
-		} else if o.safeBrowsing != rs {
-			if err = replica.ToggleSafeBrowsing(o.safeBrowsing); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (w *worker) syncConfigs(o *origin, rc client.Client) error {
-	if w.cfg.Features.QueryLogConfig {
-		qlc, err := rc.QueryLogConfig()
-		if err != nil {
-			return err
-		}
-		if !o.queryLogConfig.Equals(qlc) {
-			if err = rc.SetQueryLogConfig(o.queryLogConfig); err != nil {
-				return err
-			}
-		}
-	}
-	if w.cfg.Features.StatsConfig {
-		sc, err := rc.StatsConfig()
-		if err != nil {
-			return err
-		}
-		if o.statsConfig.Interval != sc.Interval {
-			if err = rc.SetStatsConfig(o.statsConfig); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (w *worker) syncDNS(oal *model.AccessList, odc *model.DNSConfig, rc client.Client) error {
-	if w.cfg.Features.DNS.AccessLists {
-		al, err := rc.AccessList()
-		if err != nil {
-			return err
-		}
-		if !al.Equals(oal) {
-			if err = rc.SetAccessList(oal); err != nil {
-				return err
-			}
-		}
-	}
-	if w.cfg.Features.DNS.ServerConfig {
-		dc, err := rc.DNSConfig()
-		if err != nil {
-			return err
-		}
-		if !dc.Equals(odc) {
-			if err = rc.SetDNSConfig(odc); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (w *worker) syncDHCPServer(osc *model.DhcpStatus, rc client.Client, replica types.AdGuardInstance) error {
-	if !w.cfg.Features.DHCP.ServerConfig && !w.cfg.Features.DHCP.StaticLeases {
-		return nil
-	}
-	sc, err := rc.DhcpConfig()
-	if w.cfg.Features.DHCP.ServerConfig && osc.HasConfig() {
-		if err != nil {
-			return err
-		}
-		origClone := osc.Clone()
-		if replica.InterfaceName != "" {
-			// overwrite interface name
-			origClone.InterfaceName = utils.Ptr(replica.InterfaceName)
-		}
-		if replica.DHCPServerEnabled != nil {
-			// overwrite dhcp enabled
-			origClone.Enabled = replica.DHCPServerEnabled
-		}
-
-		if !sc.Equals(origClone) {
-			if err = rc.SetDhcpConfig(origClone); err != nil {
-				return err
-			}
-		}
-	}
-
-	if w.cfg.Features.DHCP.StaticLeases {
-		a, r := model.MergeDhcpStaticLeases(sc.StaticLeases, osc.StaticLeases)
-
-		if err = rc.DeleteDHCPStaticLeases(r...); err != nil {
-			return err
-		}
-		if err = rc.AddDHCPStaticLeases(a...); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 type origin struct {
 	status                  *model.ServerStatus
 	rewrites                *model.RewriteEntries
--- a/pkg/sync/sync_test.go
+++ b/pkg/sync/sync_test.go
@@ -15,14 +15,13 @@ import (
 	. "github.com/onsi/gomega"
 )

-var boolTrue = true
-
 var _ = Describe("Sync", func() {
 	var (
 		mockCtrl *gm.Controller
 		cl       *clientmock.MockClient
 		w        *worker
 		te       error
+		ac       *actionContext
 	)

 	BeforeEach(func() {
@@ -50,16 +49,38 @@ var _ = Describe("Sync", func() {
 					StatsConfig:     true,
 					QueryLogConfig:  true,
 				},
+				Replicas: []types.AdGuardInstance{
+					{},
+				},
 			},
 		}
 		te = errors.New(uuid.NewString())
+
+		ac = &actionContext{
+			continueOnError: false,
+			rl:              l,
+			origin: &origin{
+				profileInfo: &model.ProfileInfo{
+					Name:     "origin",
+					Language: "en",
+					Theme:    "auto",
+				},
+				status:         &model.ServerStatus{},
+				safeSearch:     &model.SafeSearchConfig{},
+				queryLogConfig: &model.QueryLogConfig{},
+				statsConfig:    &model.StatsConfig{},
+			},
+			replicaStatus: &model.ServerStatus{},
+			client:        cl,
+			replica:       w.cfg.Replicas[0],
+		}
 	})
 	AfterEach(func() {
 		defer mockCtrl.Finish()
 	})

 	Context("worker", func() {
-		Context("syncRewrites", func() {
+		Context("actionDNSRewrites", func() {
 			var (
 				domain string
 				answer string
@@ -70,289 +91,238 @@ var _ = Describe("Sync", func() {
 			BeforeEach(func() {
 				domain = uuid.NewString()
 				answer = uuid.NewString()
-				reO = []model.RewriteEntry{{Domain: utils.Ptr(domain), Answer: utils.Ptr(answer)}}
-				reR = []model.RewriteEntry{{Domain: utils.Ptr(domain), Answer: utils.Ptr(answer)}}
+				reO = model.RewriteEntries{{Domain: utils.Ptr(domain), Answer: utils.Ptr(answer)}}
+				reR = model.RewriteEntries{{Domain: utils.Ptr(domain), Answer: utils.Ptr(answer)}}
 			})
 			It("should have no changes (empty slices)", func() {
+				ac.origin.rewrites = &reO
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries()
-				err := w.syncRewrites(l, &reO, cl)
+				err := actionDNSRewrites(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should add one rewrite entry", func() {
 				reR = []model.RewriteEntry{}
+				ac.origin.rewrites = &reO
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().AddRewriteEntries(reO[0])
 				cl.EXPECT().DeleteRewriteEntries()
-				err := w.syncRewrites(l, &reO, cl)
+				err := actionDNSRewrites(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should remove one rewrite entry", func() {
 				reO = []model.RewriteEntry{}
+				ac.origin.rewrites = &reO
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries(reR[0])
-				err := w.syncRewrites(l, &reO, cl)
+				err := actionDNSRewrites(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should remove one rewrite entry", func() {
 				reO = []model.RewriteEntry{}
+				ac.origin.rewrites = &reO
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries(reR[0])
-				err := w.syncRewrites(l, &reO, cl)
+				err := actionDNSRewrites(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should return error when error on RewriteList()", func() {
+				ac.origin.rewrites = &reO
 				cl.EXPECT().RewriteList().Return(nil, te)
-				err := w.syncRewrites(l, &reO, cl)
+				err := actionDNSRewrites(ac)
 				Ω(err).Should(HaveOccurred())
 			})
 			It("should return error when error on AddRewriteEntries()", func() {
+				ac.origin.rewrites = &reO
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().DeleteRewriteEntries()
 				cl.EXPECT().AddRewriteEntries().Return(te)
-				err := w.syncRewrites(l, &reO, cl)
+				err := actionDNSRewrites(ac)
 				Ω(err).Should(HaveOccurred())
 			})
 			It("should return error when error on DeleteRewriteEntries()", func() {
+				ac.origin.rewrites = &reO
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().DeleteRewriteEntries().Return(te)
-				err := w.syncRewrites(l, &reO, cl)
+				err := actionDNSRewrites(ac)
 				Ω(err).Should(HaveOccurred())
 			})
 		})
-		Context("syncClients", func() {
+		Context("actionClientSettings", func() {
 			var (
-				clO  *model.Clients
 				clR  *model.Clients
 				name string
 			)
 			BeforeEach(func() {
 				name = uuid.NewString()
-				clO = &model.Clients{Clients: &model.ClientsArray{{Name: utils.Ptr(name)}}}
+				ac.origin.clients = &model.Clients{Clients: &model.ClientsArray{{Name: utils.Ptr(name)}}}
 				clR = &model.Clients{Clients: &model.ClientsArray{{Name: utils.Ptr(name)}}}
 			})
 			It("should have no changes (empty slices)", func() {
 				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().AddClients()
-				cl.EXPECT().UpdateClients()
-				cl.EXPECT().DeleteClients()
-				err := w.syncClients(clO, cl)
+				err := actionClientSettings(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should add one client", func() {
 				clR.Clients = &model.ClientsArray{}
 				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().AddClients(&(*clO.Clients)[0])
-				cl.EXPECT().UpdateClients()
-				cl.EXPECT().DeleteClients()
-				err := w.syncClients(clO, cl)
+				cl.EXPECT().AddClient(&(*ac.origin.clients.Clients)[0])
+				err := actionClientSettings(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should update one client", func() {
 				(*clR.Clients)[0].FilteringEnabled = utils.Ptr(true)
 				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().AddClients()
-				cl.EXPECT().UpdateClients(&(*clO.Clients)[0])
-				cl.EXPECT().DeleteClients()
-				err := w.syncClients(clO, cl)
+				cl.EXPECT().UpdateClient(&(*ac.origin.clients.Clients)[0])
+				err := actionClientSettings(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should delete one client", func() {
-				clO.Clients = &model.ClientsArray{}
+				ac.origin.clients.Clients = &model.ClientsArray{}
 				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().AddClients()
-				cl.EXPECT().UpdateClients()
-				cl.EXPECT().DeleteClients(&(*clR.Clients)[0])
-				err := w.syncClients(clO, cl)
+				cl.EXPECT().DeleteClient(&(*clR.Clients)[0])
+				err := actionClientSettings(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should return error when error on Clients()", func() {
 				cl.EXPECT().Clients().Return(nil, te)
-				err := w.syncClients(clO, cl)
-				Ω(err).Should(HaveOccurred())
-			})
-			It("should return error when error on AddClients()", func() {
-				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().DeleteClients()
-				cl.EXPECT().AddClients().Return(te)
-				err := w.syncClients(clO, cl)
-				Ω(err).Should(HaveOccurred())
-			})
-			It("should return error when error on UpdateClients()", func() {
-				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().DeleteClients()
-				cl.EXPECT().AddClients()
-				cl.EXPECT().UpdateClients().Return(te)
-				err := w.syncClients(clO, cl)
-				Ω(err).Should(HaveOccurred())
-			})
-			It("should return error when error on DeleteClients()", func() {
-				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().DeleteClients().Return(te)
-				err := w.syncClients(clO, cl)
+				err := actionClientSettings(ac)
 				Ω(err).Should(HaveOccurred())
 			})
 		})
-		Context("syncGeneralSettings", func() {
-			var (
-				o  *origin
-				rs *model.ServerStatus
-			)
-			BeforeEach(func() {
-				o = &origin{
-					profileInfo: &model.ProfileInfo{
-						Name:     "origin",
-						Language: "en",
-						Theme:    "auto",
-					},
-					status:     &model.ServerStatus{},
-					safeSearch: &model.SafeSearchConfig{},
-				}
-				rs = &model.ServerStatus{}
-			})
+		Context("actionParental", func() {
 			It("should have no changes", func() {
 				cl.EXPECT().Parental()
-				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
-				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
-				cl.EXPECT().SafeBrowsing()
-				err := w.syncGeneralSettings(o, rs, cl)
-				Ω(err).ShouldNot(HaveOccurred())
-			})
-			It("should have protection enabled changes", func() {
-				o.status.ProtectionEnabled = true
-				cl.EXPECT().ToggleProtection(true)
-				cl.EXPECT().Parental()
-				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
-				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
-				cl.EXPECT().SafeBrowsing()
-				err := w.syncGeneralSettings(o, rs, cl)
+				err := actionParental(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have parental enabled changes", func() {
-				o.parental = true
+				ac.origin.parental = true
 				cl.EXPECT().Parental()
 				cl.EXPECT().ToggleParental(true)
-				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
-				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
-				cl.EXPECT().SafeBrowsing()
-				err := w.syncGeneralSettings(o, rs, cl)
+				err := actionParental(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+		})
+		Context("actionProtection", func() {
+			It("should have no changes", func() {
+				err := actionProtection(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should have protection enabled changes", func() {
+				ac.origin.status.ProtectionEnabled = true
+				cl.EXPECT().ToggleProtection(true)
+				err := actionProtection(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+		})
+		Context("actionSafeSearchConfig", func() {
+			It("should have no changes", func() {
+				cl.EXPECT().SafeSearchConfig().Return(ac.origin.safeSearch, nil)
+
+				err := actionSafeSearchConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have safeSearch enabled changes", func() {
-				o.safeSearch = &model.SafeSearchConfig{Enabled: utils.Ptr(true)}
-				cl.EXPECT().Parental()
+				ac.origin.safeSearch = &model.SafeSearchConfig{Enabled: utils.Ptr(true)}
 				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{}, nil)
-				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
-				cl.EXPECT().SetSafeSearchConfig(o.safeSearch)
-				cl.EXPECT().SafeBrowsing()
-				err := w.syncGeneralSettings(o, rs, cl)
+				cl.EXPECT().SetSafeSearchConfig(ac.origin.safeSearch)
+				err := actionSafeSearchConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have Duckduckgo safeSearch enabled changed", func() {
-				o.safeSearch = &model.SafeSearchConfig{Duckduckgo: utils.Ptr(true)}
-				cl.EXPECT().Parental()
-				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
+				ac.origin.safeSearch = &model.SafeSearchConfig{Duckduckgo: utils.Ptr(true)}
 				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{Google: utils.Ptr(true)}, nil)
-				cl.EXPECT().SafeBrowsing()
-				cl.EXPECT().SetSafeSearchConfig(o.safeSearch)
-
-				err := w.syncGeneralSettings(o, rs, cl)
+				cl.EXPECT().SetSafeSearchConfig(ac.origin.safeSearch)
+				err := actionSafeSearchConfig(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+		})
+		Context("actionProfileInfo", func() {
+			It("should have no changes", func() {
+				cl.EXPECT().ProfileInfo().Return(ac.origin.profileInfo, nil)
+				err := actionProfileInfo(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have profileInfo language changed", func() {
-				o.profileInfo.Language = "de"
-				cl.EXPECT().Parental()
+				ac.origin.profileInfo.Language = "de"
 				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{Name: "replica", Language: "en"}, nil)
-				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
-				cl.EXPECT().SafeBrowsing()
 				cl.EXPECT().SetProfileInfo(&model.ProfileInfo{
 					Language: "de",
 					Name:     "replica",
 					Theme:    "auto",
 				})
-				err := w.syncGeneralSettings(o, rs, cl)
+				err := actionProfileInfo(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should not sync profileInfo if language is not set", func() {
-				o.profileInfo.Language = ""
-				cl.EXPECT().Parental()
+				ac.origin.profileInfo.Language = ""
 				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{Name: "replica", Language: "en", Theme: "auto"}, nil)
-				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
-				cl.EXPECT().SafeBrowsing()
-				cl.EXPECT().SetProfileInfo(o.profileInfo).Times(0)
-				err := w.syncGeneralSettings(o, rs, cl)
-				Ω(err).ShouldNot(HaveOccurred())
-			})
-			It("should not sync profileInfo if language is not set", func() {
-				o.profileInfo.Language = ""
-				cl.EXPECT().Parental()
-				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{Name: "replica", Language: "en", Theme: "auto"}, nil)
-				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
-				cl.EXPECT().SafeBrowsing()
-				cl.EXPECT().SetProfileInfo(o.profileInfo).Times(0)
-				err := w.syncGeneralSettings(o, rs, cl)
+				cl.EXPECT().SetProfileInfo(ac.origin.profileInfo).Times(0)
+				err := actionProfileInfo(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should not sync profileInfo if theme is not set", func() {
-				o.profileInfo.Theme = ""
-				cl.EXPECT().Parental()
+				ac.origin.profileInfo.Theme = ""
 				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{Name: "replica", Language: "en", Theme: "auto"}, nil)
-				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
-				cl.EXPECT().SafeBrowsing()
-				cl.EXPECT().SetProfileInfo(o.profileInfo).Times(0)
-				err := w.syncGeneralSettings(o, rs, cl)
-				Ω(err).ShouldNot(HaveOccurred())
-			})
-			It("should have safeBrowsing enabled changes", func() {
-				o.safeBrowsing = true
-				cl.EXPECT().Parental()
-				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
-				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
-				cl.EXPECT().SafeBrowsing()
-				cl.EXPECT().ToggleSafeBrowsing(true)
-				err := w.syncGeneralSettings(o, rs, cl)
+				cl.EXPECT().SetProfileInfo(ac.origin.profileInfo).Times(0)
+				err := actionProfileInfo(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})
-		Context("syncConfigs", func() {
-			var (
-				o   *origin
-				qlc *model.QueryLogConfig
-				sc  *model.StatsConfig
-			)
+		Context("actionSafeBrowsing", func() {
+			It("should have no changes", func() {
+				cl.EXPECT().SafeBrowsing()
+				err := actionSafeBrowsing(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+
+			It("should have safeBrowsing enabled changes", func() {
+				ac.origin.safeBrowsing = true
+				cl.EXPECT().SafeBrowsing()
+				cl.EXPECT().ToggleSafeBrowsing(true)
+				err := actionSafeBrowsing(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+		})
+		Context("actionQueryLogConfig", func() {
+			var qlc *model.QueryLogConfig
 			BeforeEach(func() {
-				o = &origin{
-					queryLogConfig: &model.QueryLogConfig{},
-					statsConfig:    &model.StatsConfig{},
-				}
 				qlc = &model.QueryLogConfig{}
-				sc = &model.StatsConfig{}
 			})
 			It("should have no changes", func() {
 				cl.EXPECT().QueryLogConfig().Return(qlc, nil)
-				cl.EXPECT().StatsConfig().Return(sc, nil)
-				err := w.syncConfigs(o, cl)
+				err := actionQueryLogConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have QueryLogConfig changes", func() {
 				var interval model.QueryLogConfigInterval = 123
-				o.queryLogConfig.Interval = &interval
+				ac.origin.queryLogConfig.Interval = &interval
 				cl.EXPECT().QueryLogConfig().Return(qlc, nil)
 				cl.EXPECT().SetQueryLogConfig(&model.QueryLogConfig{AnonymizeClientIp: nil, Interval: &interval, Enabled: nil})
+				err := actionQueryLogConfig(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+		})
+		Context("syncConfigs", func() {
+			var sc *model.StatsConfig
+			BeforeEach(func() {
+				sc = &model.StatsConfig{}
+			})
+			It("should have no changes", func() {
 				cl.EXPECT().StatsConfig().Return(sc, nil)
-				err := w.syncConfigs(o, cl)
+				err := actionStatsConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have StatsConfig changes", func() {
 				var interval model.StatsConfigInterval = 123
-				o.statsConfig.Interval = &interval
-				cl.EXPECT().QueryLogConfig().Return(qlc, nil)
+				ac.origin.statsConfig.Interval = &interval
 				cl.EXPECT().StatsConfig().Return(sc, nil)
 				cl.EXPECT().SetStatsConfig(&model.StatsConfig{Interval: &interval})
-				err := w.syncConfigs(o, cl)
+				err := actionStatsConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})
@@ -389,161 +359,209 @@ var _ = Describe("Sync", func() {
 				Ω(st).Should(BeNil())
 			})
 		})
-		Context("syncServices", func() {
-			var (
-				obs  *model.BlockedServicesArray
-				rbs  *model.BlockedServicesArray
-				obss *model.BlockedServicesSchedule
-			)
+		Context("actionBlockedServices", func() {
+			var rbs *model.BlockedServicesArray
 			BeforeEach(func() {
-				obs = &model.BlockedServicesArray{"foo"}
+				ac.origin.blockedServices = &model.BlockedServicesArray{"foo"}
 				rbs = &model.BlockedServicesArray{"foo"}
-				obss = &model.BlockedServicesSchedule{}
 			})
 			It("should have no changes", func() {
 				cl.EXPECT().BlockedServices().Return(rbs, nil)
-				cl.EXPECT().BlockedServicesSchedule().Return(obss, nil)
-				err := w.syncServices(obs, obss, cl)
+				err := actionBlockedServices(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have blockedServices changes", func() {
-				obs = &model.BlockedServicesArray{"bar"}
+				ac.origin.blockedServices = &model.BlockedServicesArray{"bar"}

 				cl.EXPECT().BlockedServices().Return(rbs, nil)
-				cl.EXPECT().BlockedServicesSchedule().Return(obss, nil)
-				cl.EXPECT().SetBlockedServices(obs)
-				err := w.syncServices(obs, obss, cl)
+				cl.EXPECT().SetBlockedServices(ac.origin.blockedServices)
+				err := actionBlockedServices(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+		})
+		Context("actionBlockedServicesSchedule", func() {
+			var rbss *model.BlockedServicesSchedule
+			BeforeEach(func() {
+				ac.origin.blockedServicesSchedule = &model.BlockedServicesSchedule{}
+				rbss = &model.BlockedServicesSchedule{}
+			})
+			It("should have no changes", func() {
+				cl.EXPECT().BlockedServicesSchedule().Return(ac.origin.blockedServicesSchedule, nil)
+				err := actionBlockedServicesSchedule(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should have blockedServices schedule changes", func() {
+				ac.origin.blockedServicesSchedule = &model.BlockedServicesSchedule{Ids: utils.Ptr([]string{"bar"})}
+
+				cl.EXPECT().BlockedServicesSchedule().Return(rbss, nil)
+				cl.EXPECT().SetBlockedServicesSchedule(ac.origin.blockedServicesSchedule)
+				err := actionBlockedServicesSchedule(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})
 		Context("syncFilters", func() {
-			var (
-				of *model.FilterStatus
-				rf *model.FilterStatus
-			)
+			var rf *model.FilterStatus
 			BeforeEach(func() {
-				of = &model.FilterStatus{}
+				ac.origin.filters = &model.FilterStatus{}
 				rf = &model.FilterStatus{}
 			})
 			It("should have no changes", func() {
 				cl.EXPECT().Filtering().Return(rf, nil)
-				cl.EXPECT().AddFilters(false)
-				cl.EXPECT().UpdateFilters(false)
-				cl.EXPECT().DeleteFilters(false)
-				cl.EXPECT().AddFilters(true)
-				cl.EXPECT().UpdateFilters(true)
-				cl.EXPECT().DeleteFilters(true)
-				err := w.syncFilters(of, cl)
+				err := actionFilters(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have changes user roles", func() {
-				of.UserRules = utils.Ptr([]string{"foo"})
+				ac.origin.filters.UserRules = utils.Ptr([]string{"foo"})
 				cl.EXPECT().Filtering().Return(rf, nil)
-				cl.EXPECT().AddFilters(false)
-				cl.EXPECT().UpdateFilters(false)
-				cl.EXPECT().DeleteFilters(false)
-				cl.EXPECT().AddFilters(true)
-				cl.EXPECT().UpdateFilters(true)
-				cl.EXPECT().DeleteFilters(true)
-				cl.EXPECT().SetCustomRules(of.UserRules)
-				err := w.syncFilters(of, cl)
+				cl.EXPECT().SetCustomRules(ac.origin.filters.UserRules)
+				err := actionFilters(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have changed filtering config", func() {
-				of.Enabled = utils.Ptr(true)
-				of.Interval = utils.Ptr(123)
+				ac.origin.filters.Enabled = utils.Ptr(true)
+				ac.origin.filters.Interval = utils.Ptr(123)
 				cl.EXPECT().Filtering().Return(rf, nil)
-				cl.EXPECT().AddFilters(false)
-				cl.EXPECT().UpdateFilters(false)
-				cl.EXPECT().DeleteFilters(false)
-				cl.EXPECT().AddFilters(true)
-				cl.EXPECT().UpdateFilters(true)
-				cl.EXPECT().DeleteFilters(true)
-				cl.EXPECT().ToggleFiltering(*of.Enabled, *of.Interval)
-				err := w.syncFilters(of, cl)
+				cl.EXPECT().ToggleFiltering(*ac.origin.filters.Enabled, *ac.origin.filters.Interval)
+				err := actionFilters(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should add a filter", func() {
+				ac.origin.filters.Filters = utils.Ptr([]model.Filter{{Name: "foo", Url: "https://foo.bar"}})
+				cl.EXPECT().Filtering().Return(rf, nil)
+				cl.EXPECT().AddFilter(false, model.Filter{Name: "foo", Url: "https://foo.bar"})
+				cl.EXPECT().RefreshFilters(gm.Any())
+				err := actionFilters(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should delete a filter", func() {
+				rf.Filters = utils.Ptr([]model.Filter{{Name: "foo", Url: "https://foo.bar"}})
+				cl.EXPECT().Filtering().Return(rf, nil)
+				cl.EXPECT().DeleteFilter(false, model.Filter{Name: "foo", Url: "https://foo.bar"})
+				err := actionFilters(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should update a filter", func() {
+				ac.origin.filters.Filters = utils.Ptr([]model.Filter{{Name: "foo", Url: "https://foo.bar", Enabled: true}})
+				rf.Filters = utils.Ptr([]model.Filter{{Name: "foo", Url: "https://foo.bar"}})
+				cl.EXPECT().Filtering().Return(rf, nil)
+				cl.EXPECT().UpdateFilter(false, model.Filter{Name: "foo", Url: "https://foo.bar", Enabled: true})
+				cl.EXPECT().RefreshFilters(gm.Any())
+				err := actionFilters(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+
+			It("should abort after failed added filter", func() {
+				ac.continueOnError = false
+				ac.origin.filters.Filters = utils.Ptr([]model.Filter{{Name: "foo", Url: "https://foo.bar"}})
+				cl.EXPECT().Filtering().Return(rf, nil)
+				cl.EXPECT().AddFilter(false, model.Filter{Name: "foo", Url: "https://foo.bar"}).Return(errors.New("test failure"))
+				err := actionFilters(ac)
+				Ω(err).Should(HaveOccurred())
+			})
+
+			It("should continue after failed added filter", func() {
+				ac.continueOnError = true
+				ac.origin.filters.Filters = utils.Ptr([]model.Filter{{Name: "foo", Url: "https://foo.bar"}, {Name: "bar", Url: "https://bar.foo"}})
+				cl.EXPECT().Filtering().Return(rf, nil)
+				cl.EXPECT().AddFilter(false, model.Filter{Name: "foo", Url: "https://foo.bar"}).Return(errors.New("test failure"))
+				cl.EXPECT().AddFilter(false, model.Filter{Name: "bar", Url: "https://bar.foo"})
+				cl.EXPECT().RefreshFilters(gm.Any())
+				err := actionFilters(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})

-		Context("syncDNS", func() {
-			var (
-				oal *model.AccessList
-				ral *model.AccessList
-				odc *model.DNSConfig
-				rdc *model.DNSConfig
-			)
+		Context("actionDNSAccessLists", func() {
+			var ral *model.AccessList
 			BeforeEach(func() {
-				oal = &model.AccessList{}
+				ac.origin.accessList = &model.AccessList{}
 				ral = &model.AccessList{}
-				odc = &model.DNSConfig{}
-				rdc = &model.DNSConfig{}
 			})
 			It("should have no changes", func() {
 				cl.EXPECT().AccessList().Return(ral, nil)
-				cl.EXPECT().DNSConfig().Return(rdc, nil)
-				err := w.syncDNS(oal, odc, cl)
+				err := actionDNSAccessLists(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have access list changes", func() {
 				ral.BlockedHosts = utils.Ptr([]string{"foo"})
 				cl.EXPECT().AccessList().Return(ral, nil)
-				cl.EXPECT().DNSConfig().Return(rdc, nil)
-				cl.EXPECT().SetAccessList(oal)
-				err := w.syncDNS(oal, odc, cl)
-				Ω(err).ShouldNot(HaveOccurred())
-			})
-			It("should have dns config changes", func() {
-				rdc.BootstrapDns = utils.Ptr([]string{"foo"})
-				cl.EXPECT().AccessList().Return(ral, nil)
-				cl.EXPECT().DNSConfig().Return(rdc, nil)
-				cl.EXPECT().SetDNSConfig(odc)
-				err := w.syncDNS(oal, odc, cl)
+				cl.EXPECT().SetAccessList(ac.origin.accessList)
+				err := actionDNSAccessLists(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})

-		Context("syncDHCPServer", func() {
-			var (
-				osc *model.DhcpStatus
-				rsc *model.DhcpStatus
-			)
+		Context("actionDNSServerConfig", func() {
+			var rdc *model.DNSConfig
 			BeforeEach(func() {
-				osc = &model.DhcpStatus{V4: &model.DhcpConfigV4{
-					GatewayIp:  utils.Ptr("1.2.3.4"),
-					RangeStart: utils.Ptr("1.2.3.5"),
-					RangeEnd:   utils.Ptr("1.2.3.6"),
-					SubnetMask: utils.Ptr("255.255.255.0"),
-				}}
+				ac.origin.dnsConfig = &model.DNSConfig{}
+				rdc = &model.DNSConfig{}
+			})
+			It("should have no changes", func() {
+				cl.EXPECT().DNSConfig().Return(rdc, nil)
+				err := actionDNSServerConfig(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should have dns config changes", func() {
+				rdc.BootstrapDns = utils.Ptr([]string{"foo"})
+				cl.EXPECT().DNSConfig().Return(rdc, nil)
+				cl.EXPECT().SetDNSConfig(ac.origin.dnsConfig)
+				err := actionDNSServerConfig(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+		})
+
+		Context("actionDHCPServerConfig", func() {
+			var rsc *model.DhcpStatus
+			BeforeEach(func() {
+				ac.origin.dhcpServerConfig = &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp:  utils.Ptr("1.2.3.4"),
+						RangeStart: utils.Ptr("1.2.3.5"),
+						RangeEnd:   utils.Ptr("1.2.3.6"),
+						SubnetMask: utils.Ptr("255.255.255.0"),
+					},
+				}
 				rsc = &model.DhcpStatus{}
 				w.cfg.Features.DHCP.StaticLeases = false
 			})
 			It("should have no changes", func() {
-				rsc.V4 = osc.V4
+				rsc.V4 = ac.origin.dhcpServerConfig.V4
 				cl.EXPECT().DhcpConfig().Return(rsc, nil)
-				err := w.syncDHCPServer(osc, cl, types.AdGuardInstance{})
+				err := actionDHCPServerConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have changes", func() {
 				rsc.Enabled = utils.Ptr(true)
 				cl.EXPECT().DhcpConfig().Return(rsc, nil)
-				cl.EXPECT().SetDhcpConfig(osc)
-				err := w.syncDHCPServer(osc, cl, types.AdGuardInstance{})
+				cl.EXPECT().SetDhcpConfig(ac.origin.dhcpServerConfig)
+				err := actionDHCPServerConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should use replica interface name", func() {
+				ac.replica.InterfaceName = "foo"
 				cl.EXPECT().DhcpConfig().Return(rsc, nil)
-				oscClone := osc.Clone()
+				oscClone := ac.origin.dhcpServerConfig.Clone()
 				oscClone.InterfaceName = utils.Ptr("foo")
 				cl.EXPECT().SetDhcpConfig(oscClone)
-				err := w.syncDHCPServer(osc, cl, types.AdGuardInstance{InterfaceName: "foo"})
+				err := actionDHCPServerConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should enable the target dhcp server", func() {
+				ac.replica.DHCPServerEnabled = utils.Ptr(true)
 				cl.EXPECT().DhcpConfig().Return(rsc, nil)
-				oscClone := osc.Clone()
+				oscClone := ac.origin.dhcpServerConfig.Clone()
 				oscClone.Enabled = utils.Ptr(true)
 				cl.EXPECT().SetDhcpConfig(oscClone)
-				err := w.syncDHCPServer(osc, cl, types.AdGuardInstance{DHCPServerEnabled: &boolTrue})
+				err := actionDHCPServerConfig(ac)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should not sync empty IPv4", func() {
+				ac.replica.DHCPServerEnabled = utils.Ptr(false)
+				ac.origin.dhcpServerConfig.V4 = &model.DhcpConfigV4{
+					GatewayIp: utils.Ptr(""),
+				}
+				err := actionDHCPServerConfig(ac)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})
@@ -604,23 +622,12 @@ var _ = Describe("Sync", func() {
 				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries()
 				cl.EXPECT().Filtering().Return(&model.FilterStatus{}, nil)
-				cl.EXPECT().AddFilters(false)
-				cl.EXPECT().UpdateFilters(false)
-				cl.EXPECT().DeleteFilters(false)
-				cl.EXPECT().AddFilters(true)
-				cl.EXPECT().UpdateFilters(true)
-				cl.EXPECT().DeleteFilters(true)
 				cl.EXPECT().BlockedServices()
 				cl.EXPECT().BlockedServicesSchedule()
 				cl.EXPECT().Clients().Return(&model.Clients{}, nil)
-				cl.EXPECT().AddClients()
-				cl.EXPECT().UpdateClients()
-				cl.EXPECT().DeleteClients()
 				cl.EXPECT().AccessList().Return(&model.AccessList{}, nil)
 				cl.EXPECT().DNSConfig().Return(&model.DNSConfig{}, nil)
 				cl.EXPECT().DhcpConfig().Return(&model.DhcpStatus{}, nil)
-				cl.EXPECT().AddDHCPStaticLeases().Return(nil)
-				cl.EXPECT().DeleteDHCPStaticLeases().Return(nil)
 				w.sync()
 			})
 			It("should not sync DHCP", func() {
@@ -656,18 +663,9 @@ var _ = Describe("Sync", func() {
 				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries()
 				cl.EXPECT().Filtering().Return(&model.FilterStatus{}, nil)
-				cl.EXPECT().AddFilters(false)
-				cl.EXPECT().UpdateFilters(false)
-				cl.EXPECT().DeleteFilters(false)
-				cl.EXPECT().AddFilters(true)
-				cl.EXPECT().UpdateFilters(true)
-				cl.EXPECT().DeleteFilters(true)
 				cl.EXPECT().BlockedServices()
 				cl.EXPECT().BlockedServicesSchedule()
 				cl.EXPECT().Clients().Return(&model.Clients{}, nil)
-				cl.EXPECT().AddClients()
-				cl.EXPECT().UpdateClients()
-				cl.EXPECT().DeleteClients()
 				cl.EXPECT().AccessList().Return(&model.AccessList{}, nil)
 				cl.EXPECT().DNSConfig().Return(&model.DNSConfig{}, nil)
 				w.sync()
--- a/pkg/types/features.go
+++ b/pkg/types/features.go
@@ -4,33 +4,61 @@ import (
 	"go.uber.org/zap"
 )

+func NewFeatures(enabled bool) Features {
+	return Features{
+		DNS: DNS{
+			AccessLists:  enabled,
+			ServerConfig: enabled,
+			Rewrites:     enabled,
+		},
+		DHCP: DHCP{
+			ServerConfig: enabled,
+			StaticLeases: enabled,
+		},
+		GeneralSettings: enabled,
+		QueryLogConfig:  enabled,
+		StatsConfig:     enabled,
+		ClientSettings:  enabled,
+		Services:        enabled,
+		Filters:         enabled,
+	}
+}
+
 // Features feature flags
 type Features struct {
 	DNS             DNS  `json:"dns" yaml:"dns"`
 	DHCP            DHCP `json:"dhcp" yaml:"dhcp"`
-	GeneralSettings bool `json:"generalSettings" yaml:"generalSettings"`
-	QueryLogConfig  bool `json:"queryLogConfig" yaml:"queryLogConfig"`
-	StatsConfig     bool `json:"statsConfig" yaml:"statsConfig"`
-	ClientSettings  bool `json:"clientSettings" yaml:"clientSettings"`
-	Services        bool `json:"services" yaml:"services"`
-	Filters         bool `json:"filters" yaml:"filters"`
+	GeneralSettings bool `json:"generalSettings" yaml:"generalSettings" env:"FEATURES_GENERAL_SETTINGS"`
+	QueryLogConfig  bool `json:"queryLogConfig" yaml:"queryLogConfig" env:"FEATURES_QUERY_LOG_CONFIG"`
+	StatsConfig     bool `json:"statsConfig" yaml:"statsConfig" env:"FEATURES_STATS_CONFIG"`
+	ClientSettings  bool `json:"clientSettings" yaml:"clientSettings" env:"FEATURES_CLIENT_SETTINGS"`
+	Services        bool `json:"services" yaml:"services" env:"FEATURES_SERVICES"`
+	Filters         bool `json:"filters" yaml:"filters" env:"FEATURES_FILTERS"`
 }

 // DHCP features
 type DHCP struct {
-	ServerConfig bool `json:"serverConfig" yaml:"serverConfig"`
-	StaticLeases bool `json:"staticLeases" yaml:"staticLeases"`
+	ServerConfig bool `json:"serverConfig" yaml:"serverConfig" env:"FEATURES_DHCP_SERVER_CONFIG"`
+	StaticLeases bool `json:"staticLeases" yaml:"staticLeases" env:"FEATURES_DHCP_STATIC_LEASES"`
 }

 // DNS features
 type DNS struct {
-	AccessLists  bool `json:"accessLists" yaml:"accessLists"`
-	ServerConfig bool `json:"serverConfig" yaml:"serverConfig"`
-	Rewrites     bool `json:"rewrites" yaml:"rewrites"`
+	AccessLists  bool `json:"accessLists" yaml:"accessLists" env:"FEATURES_DNS_ACCESS_LISTS"`
+	ServerConfig bool `json:"serverConfig" yaml:"serverConfig" env:"FEATURES_DNS_SERVER_CONFIG"`
+	Rewrites     bool `json:"rewrites" yaml:"rewrites" env:"FEATURES_DNS_REWRITES"`
 }

 // LogDisabled log all disabled features
 func (f *Features) LogDisabled(l *zap.SugaredLogger) {
+	features := f.collectDisabled()
+
+	if len(features) > 0 {
+		l.With("features", features).Info("Disabled features")
+	}
+}
+
+func (f *Features) collectDisabled() []string {
 	var features []string
 	if !f.DHCP.ServerConfig {
 		features = append(features, "DHCP.ServerConfig")
@@ -65,8 +93,5 @@ func (f *Features) LogDisabled(l *zap.SugaredLogger) {
 	if !f.Filters {
 		features = append(features, "Filters")
 	}
-
-	if len(features) > 0 {
-		l.With("features", features).Info("Disabled features")
-	}
+	return features
 }
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -2,6 +2,8 @@ package types

 import (
 	"fmt"
+	"net/url"
+	"strings"

 	"go.uber.org/zap"
 )
@@ -14,31 +16,44 @@ const (
 // Config application configuration struct
 // +k8s:deepcopy-gen=true
 type Config struct {
-	Origin          AdGuardInstance   `json:"origin" yaml:"origin"`
-	Replica         *AdGuardInstance  `json:"replica,omitempty" yaml:"replica,omitempty"`
+	Origin          AdGuardInstance   `json:"origin" yaml:"origin" env:"ORIGIN"`
+	Replica         *AdGuardInstance  `json:"replica,omitempty" yaml:"replica,omitempty" env:"REPLICA"`
 	Replicas        []AdGuardInstance `json:"replicas,omitempty" yaml:"replicas,omitempty"`
-	Cron            string            `json:"cron,omitempty" yaml:"cron,omitempty"`
-	RunOnStart      bool              `json:"runOnStart,omitempty" yaml:"runOnStart,omitempty"`
-	PrintConfigOnly bool              `json:"printConfigOnly,omitempty" yaml:"printConfigOnly,omitempty"`
-	API             API               `json:"api,omitempty" yaml:"api,omitempty"`
-	Features        Features          `json:"features,omitempty" yaml:"features,omitempty"`
+	Cron            string            `json:"cron,omitempty" yaml:"cron,omitempty" env:"CRON"`
+	RunOnStart      bool              `json:"runOnStart,omitempty" yaml:"runOnStart,omitempty" env:"RUN_ON_START"`
+	PrintConfigOnly bool              `json:"printConfigOnly,omitempty" yaml:"printConfigOnly,omitempty" env:"PRINT_CONFIG_ONLY"`
+	ContinueOnError bool              `json:"continueOnError,omitempty" yaml:"continueOnError,omitempty" env:"CONTINUE_ON_ERROR"`
+	API             API               `json:"api,omitempty" yaml:"api,omitempty" env:"API"`
+	Features        Features          `json:"features,omitempty" yaml:"features,omitempty" env:"FEATURES_"`
 }

 // API configuration
 type API struct {
-	Port     int    `json:"port,omitempty" yaml:"port,omitempty"`
-	Username string `json:"username,omitempty" yaml:"username,omitempty"`
-	Password string `json:"password,omitempty" yaml:"password,omitempty"`
-	DarkMode bool   `json:"darkMode,omitempty" yaml:"darkMode,omitempty"`
+	Port     int    `json:"port,omitempty" yaml:"port,omitempty" env:"API_PORT"`
+	Username string `json:"username,omitempty" yaml:"username,omitempty" env:"API_USERNAME"`
+	Password string `json:"password,omitempty" yaml:"password,omitempty" env:"API_PASSWORD"`
+	DarkMode bool   `json:"darkMode,omitempty" yaml:"darkMode,omitempty" env:"API_DARK_MODE"`
+}
+
+// Mask maks username and password
+func (a *API) Mask() {
+	a.Username = mask(a.Username)
+	a.Password = mask(a.Password)
 }

 // UniqueReplicas get unique replication instances
 func (cfg *Config) UniqueReplicas() []AdGuardInstance {
 	dedup := make(map[string]AdGuardInstance)
 	if cfg.Replica != nil && cfg.Replica.URL != "" {
+		if cfg.Replica.APIPath == "" {
+			cfg.Replica.APIPath = DefaultAPIPath
+		}
 		dedup[cfg.Replica.Key()] = *cfg.Replica
 	}
 	for _, replica := range cfg.Replicas {
+		if replica.APIPath == "" {
+			replica.APIPath = DefaultAPIPath
+		}
 		if replica.URL != "" {
 			dedup[replica.Key()] = replica
 		}
@@ -46,9 +61,6 @@ func (cfg *Config) UniqueReplicas() []AdGuardInstance {

 	var r []AdGuardInstance
 	for _, replica := range dedup {
-		if replica.APIPath == "" {
-			replica.APIPath = DefaultAPIPath
-		}
 		r = append(r, replica)
 	}
 	return r
@@ -56,6 +68,11 @@ func (cfg *Config) UniqueReplicas() []AdGuardInstance {

 // Log the current config
 func (cfg *Config) Log(l *zap.SugaredLogger) {
+	c := cfg.mask()
+	l.With("config", c).Debug("Using config")
+}
+
+func (cfg *Config) mask() *Config {
 	c := cfg.DeepCopy()
 	c.Origin.Mask()
 	if c.Replica != nil {
@@ -68,21 +85,39 @@ func (cfg *Config) Log(l *zap.SugaredLogger) {
 	for i := range c.Replicas {
 		c.Replicas[i].Mask()
 	}
-	l.With("config", c).Debug("Using config")
+	c.API.Mask()
+	return c
+}
+
+func (cfg *Config) Init() error {
+	if err := cfg.Origin.Init(); err != nil {
+		return err
+	}
+	for i := range cfg.Replicas {
+		replica := &cfg.Replicas[i]
+		if err := replica.Init(); err != nil {
+			return err
+		}
+	}
+	return nil
 }

 // AdGuardInstance AdguardHome config instance
 // +k8s:deepcopy-gen=true
 type AdGuardInstance struct {
-	URL                string `json:"url" yaml:"url"`
-	APIPath            string `json:"apiPath,omitempty" yaml:"apiPath,omitempty"`
-	Username           string `json:"username,omitempty" yaml:"username,omitempty"`
-	Password           string `json:"password,omitempty" yaml:"password,omitempty"`
-	Cookie             string `json:"cookie,omitempty" yaml:"cookie,omitempty"`
-	InsecureSkipVerify bool   `json:"insecureSkipVerify" yaml:"insecureSkipVerify"`
-	AutoSetup          bool   `json:"autoSetup" yaml:"autoSetup"`
-	InterfaceName      string `json:"interfaceName,omitempty" yaml:"interfaceName,omitempty"`
-	DHCPServerEnabled  *bool  `json:"dhcpServerEnabled,omitempty" yaml:"dhcpServerEnabled,omitempty"`
+	URL                string `json:"url" yaml:"url" env:"URL"`
+	WebURL             string `json:"webURL" yaml:"webURL" env:"WEB_URL"`
+	APIPath            string `json:"apiPath,omitempty" yaml:"apiPath,omitempty" env:"API_PATH"`
+	Username           string `json:"username,omitempty" yaml:"username,omitempty" env:"USERNAME"`
+	Password           string `json:"password,omitempty" yaml:"password,omitempty" env:"PASSWORD"`
+	Cookie             string `json:"cookie,omitempty" yaml:"cookie,omitempty" env:"COOKIE"`
+	InsecureSkipVerify bool   `json:"insecureSkipVerify" yaml:"insecureSkipVerify" env:"INSECURE_SKIP_VERIFY"`
+	AutoSetup          bool   `json:"autoSetup" yaml:"autoSetup" env:"AUTO_SETUP"`
+	InterfaceName      string `json:"interfaceName,omitempty" yaml:"interfaceName,omitempty" env:"INTERFACE_NAME"`
+	DHCPServerEnabled  *bool  `json:"dhcpServerEnabled,omitempty" yaml:"dhcpServerEnabled,omitempty" env:"DHCP_SERVER_ENABLED"`
+
+	Host    string `json:"-" yaml:"-"`
+	WebHost string `json:"-" yaml:"-"`
 }

 // Key AdGuardInstance key
@@ -96,11 +131,32 @@ func (i *AdGuardInstance) Mask() {
 	i.Password = mask(i.Password)
 }

+func (i *AdGuardInstance) Init() error {
+	u, err := url.Parse(i.URL)
+	if err != nil {
+		return err
+	}
+	i.Host = u.Host
+
+	if i.WebURL == "" {
+		i.WebHost = i.Host
+		i.WebURL = i.URL
+	} else {
+		u, err := url.Parse(i.WebURL)
+		if err != nil {
+			return err
+		}
+		i.WebHost = u.Host
+	}
+	return nil
+}
+
 func mask(s string) string {
 	if s == "" {
 		return "***"
 	}
-	return fmt.Sprintf("%v***%v", string(s[0]), string(s[len(s)-1]))
+	mask := strings.Repeat("*", len(s)-2)
+	return fmt.Sprintf("%v%s%v", string(s[0]), mask, string(s[len(s)-1]))
 }

 // Protection API struct
--- a/pkg/types/types_suite_test.go
+++ b/pkg/types/types_suite_test.go
@@ -0,0 +1,13 @@
+package types_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestSync(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Types Suite")
+}
--- a/pkg/types/types_test.go
+++ b/pkg/types/types_test.go
@@ -0,0 +1,99 @@
+package types
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Types", func() {
+	Context("AdGuardInstance", func() {
+		var inst AdGuardInstance
+
+		BeforeEach(func() {
+			inst = AdGuardInstance{}
+		})
+		Context("Instance Init", func() {
+			BeforeEach(func() {
+				inst.URL = "https://localhost:3000"
+			})
+			It("should correctly set Host and WebHost if only URL is set", func() {
+				err := inst.Init()
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(inst.Host).Should(Equal("localhost:3000"))
+				Ω(inst.WebHost).Should(Equal("localhost:3000"))
+				Ω(inst.URL).Should(Equal("https://localhost:3000"))
+				Ω(inst.WebURL).Should(Equal("https://localhost:3000"))
+			})
+			It("should correctly set Host and WebHost if URL and WebURL are set", func() {
+				inst.WebURL = "https://127.0.0.1:4000"
+				err := inst.Init()
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(inst.Host).Should(Equal("localhost:3000"))
+				Ω(inst.WebHost).Should(Equal("127.0.0.1:4000"))
+				Ω(inst.WebURL).Should(Equal(inst.WebURL))
+				Ω(inst.URL).Should(Equal("https://localhost:3000"))
+				Ω(inst.WebURL).Should(Equal("https://127.0.0.1:4000"))
+			})
+		})
+	})
+	Context("Config", func() {
+		Context("init", func() {
+			cfg := Config{
+				Replicas: []AdGuardInstance{
+					{URL: "https://localhost:3000"},
+				},
+			}
+			err := cfg.Init()
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(cfg.Replicas[0].Host).Should(Equal("localhost:3000"))
+			Ω(cfg.Replicas[0].WebHost).Should(Equal("localhost:3000"))
+			Ω(cfg.Replicas[0].URL).Should(Equal("https://localhost:3000"))
+			Ω(cfg.Replicas[0].WebURL).Should(Equal("https://localhost:3000"))
+		})
+		Context("UniqueReplicas", func() {
+			It("should return unique replicas in the array", func() {
+				cfg := Config{
+					Replicas: []AdGuardInstance{
+						{URL: "a"},
+						{URL: "a", APIPath: DefaultAPIPath},
+						{URL: "a", APIPath: "foo"},
+						{URL: "b", APIPath: DefaultAPIPath},
+					},
+					Replica: &AdGuardInstance{URL: "b"},
+				}
+				replicas := cfg.UniqueReplicas()
+				Ω(replicas).Should(HaveLen(3))
+			})
+		})
+		Context("mask", func() {
+			It("should mask all names and passwords", func() {
+				cfg := Config{
+					Replicas: []AdGuardInstance{
+						{URL: "a", Username: "user", Password: "pass"},
+					},
+					Replica: &AdGuardInstance{URL: "a", Username: "user", Password: "pass"},
+					API:     API{Username: "user", Password: "pass"},
+				}
+				masked := cfg.mask()
+				Ω(masked.Replicas[0].Username).Should(Equal("u**r"))
+				Ω(masked.Replicas[0].Password).Should(Equal("p**s"))
+				Ω(masked.Replica.Username).Should(Equal("u**r"))
+				Ω(masked.Replica.Password).Should(Equal("p**s"))
+				Ω(masked.API.Username).Should(Equal("u**r"))
+				Ω(masked.API.Password).Should(Equal("p**s"))
+			})
+		})
+	})
+	Context("Feature", func() {
+		Context("LogDisabled", func() {
+			It("should log all features", func() {
+				f := NewFeatures(false)
+				Ω(f.collectDisabled()).Should(HaveLen(11))
+			})
+			It("should log no features", func() {
+				f := NewFeatures(true)
+				Ω(f.collectDisabled()).Should(BeEmpty())
+			})
+		})
+	})
+})
--- a/testdata/.gitignore
+++ b/testdata/.gitignore
@@ -1 +1,2 @@
 docker-compose.yaml
+!config_test_*.yaml
--- a/testdata/config_test_replica.yaml
+++ b/testdata/config_test_replica.yaml
@@ -0,0 +1,36 @@
+origin:
+  url: https://origin-file:443
+  webURL: https://origin-file:443
+  apiPath: /control
+  username: foo
+  password: '*********'
+  insecureSkipVerify: true
+  autoSetup: false
+replica:
+  url: https://replica-file:443
+  webURL: https://replica-file:443
+  apiPath: /control
+  username: bar
+  password: '*********'
+  insecureSkipVerify: false
+  autoSetup: false
+  interfaceName: eth3
+cron: '*/15 * * * *'
+runOnStart: true
+printConfigOnly: true
+api:
+  port: 9090
+features:
+  dns:
+    accessLists: true
+    serverConfig: false
+    rewrites: true
+  dhcp:
+    serverConfig: true
+    staticLeases: true
+  generalSettings: true
+  queryLogConfig: true
+  statsConfig: true
+  clientSettings: true
+  services: true
+  filters: true
--- a/testdata/config_test_replicas.yaml
+++ b/testdata/config_test_replicas.yaml
@@ -0,0 +1,36 @@
+origin:
+  url: https://origin-file:443
+  webURL: https://origin-file:443
+  apiPath: /control
+  username: foo
+  password: '*********'
+  insecureSkipVerify: true
+  autoSetup: false
+replicas:
+  - url: https://replica-file:443
+    webURL: https://replica-file:443
+    apiPath: /control
+    username: bar
+    password: '*********'
+    insecureSkipVerify: false
+    autoSetup: false
+    interfaceName: eth3
+cron: '*/15 * * * *'
+runOnStart: true
+printConfigOnly: true
+api:
+  port: 9090
+features:
+  dns:
+    accessLists: true
+    serverConfig: false
+    rewrites: true
+  dhcp:
+    serverConfig: true
+    staticLeases: true
+  generalSettings: true
+  queryLogConfig: true
+  statsConfig: true
+  clientSettings: true
+  services: true
+  filters: true
--- a/testdata/config_test_replicas_and_replica.yaml
+++ b/testdata/config_test_replicas_and_replica.yaml
@@ -0,0 +1,45 @@
+origin:
+  url: https://origin-file:443
+  webURL: https://origin-file:443
+  apiPath: /control
+  username: foo
+  password: '*********'
+  insecureSkipVerify: true
+  autoSetup: false
+replica:
+  url: https://replica-file:443
+  webURL: https://replica-file:443
+  apiPath: /control
+  username: bar
+  password: '*********'
+  insecureSkipVerify: false
+  autoSetup: false
+  interfaceName: eth3
+replicas:
+  - url: https://replicas-file:443
+    webURL: https://replicas-file:443
+    apiPath: /control
+    username: bar
+    password: '*********'
+    insecureSkipVerify: false
+    autoSetup: false
+    interfaceName: eth3
+cron: '*/15 * * * *'
+runOnStart: true
+printConfigOnly: true
+api:
+  port: 9090
+features:
+  dns:
+    accessLists: true
+    serverConfig: false
+    rewrites: true
+  dhcp:
+    serverConfig: true
+    staticLeases: true
+  generalSettings: true
+  queryLogConfig: true
+  statsConfig: true
+  clientSettings: true
+  services: true
+  filters: true
--- a/testdata/e2e/bin/install-chart.sh
+++ b/testdata/e2e/bin/install-chart.sh
@@ -6,4 +6,4 @@ kubectl config set-context --current --namespace=agh-e2e
 if [[ $(helm list --no-headers -n agh-e2e | grep agh-e2e | wc -l) == "1" ]]; then
  helm delete agh-e2e -n agh-e2e --wait
 fi
-helm install agh-e2e testdata/e2e -n agh-e2e --create-namespace
+helm install agh-e2e testdata/e2e -n agh-e2e --create-namespace --set mode=${1}
--- a/testdata/e2e/bin/wait-for-sync.sh
+++ b/testdata/e2e/bin/wait-for-sync.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
-set -e

 kubectl wait --for=jsonpath='{.status.phase}'=Succeeded pod/adguardhome-sync --timeout=1m
+RESULT=$?
+if [[ "${RESULT}" != "0" ]]; then
+  kubectl logs adguardhome-sync
+fi
+exit ${RESULT}
--- a/testdata/e2e/templates/configmap-sync-env.yaml
+++ b/testdata/e2e/templates/configmap-sync-env.yaml
@@ -0,0 +1,18 @@
+{{- if eq .Values.mode "env" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sync-conf
+  namespace: {{ .Release.Namespace }}
+data:
+  API_PORT: '0'
+  ORIGIN_URL: 'http://service-origin.{{ $.Release.Namespace }}.svc.cluster.local:3000'
+  ORIGIN_PASSWORD: 'password'
+  ORIGIN_USERNAME: 'username'
+  {{- range $i,$version := .Values.replica.versions }}
+  REPLICA{{ add 1 $i }}_AUTO_SETUP: 'true'
+  REPLICA{{ add 1 $i }}_URL: 'http://service-replica-{{ $version | toString | replace "." "-" }}.{{ $.Release.Namespace }}.svc.cluster.local:3000'
+  REPLICA{{ add 1 $i }}_PASSWORD: 'password'
+  REPLICA{{ add 1 $i }}_USERNAME: 'username'
+  {{- end }}
+{{- end }}
--- a/testdata/e2e/templates/configmap-sync-file.yaml
+++ b/testdata/e2e/templates/configmap-sync-file.yaml
@@ -0,0 +1,22 @@
+{{- if eq .Values.mode "file" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sync-conf
+  namespace: {{ .Release.Namespace }}
+data:
+  config.yaml: |
+    origin:
+      url: 'http://service-origin.{{ $.Release.Namespace }}.svc.cluster.local:3000'
+      username: username
+      password: password
+    api:
+      port: 0
+    replicas:
+      {{- range $i,$version := .Values.replica.versions }}
+      - url: 'http://service-replica-{{ $version | toString | replace "." "-" }}.{{ $.Release.Namespace }}.svc.cluster.local:3000'
+        username: username
+        password: password
+        autoSetup: true
+      {{- end }}
+{{- end }}
--- a/testdata/e2e/templates/configmap-sync.yaml
+++ b/testdata/e2e/templates/configmap-sync.yaml
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: sync-conf
-  namespace: {{ .Release.Namespace }}
-data:
-  API_PORT: '0'
-  LOG_LEVEL: 'debug'
-  ORIGIN_URL: 'http://service-origin.{{ $.Release.Namespace }}.svc.cluster.local:3000'
-  ORIGIN_PASSWORD: 'password'
-  ORIGIN_USERNAME: 'username'
-  {{ range $i,$version := .Values.replica.versions }}
-  REPLICA{{ $i }}_AUTOSETUP: 'true'
-  REPLICA{{ $i }}_URL: 'http://service-replica-{{ $version | toString | replace "." "-" }}.{{ $.Release.Namespace }}.svc.cluster.local:3000'
-  REPLICA{{ $i }}_PASSWORD: 'password'
-  REPLICA{{ $i }}_USERNAME: 'username'
-{{- end }}
--- a/testdata/e2e/templates/pod-adguardhome-sync-env.yaml
+++ b/testdata/e2e/templates/pod-adguardhome-sync-env.yaml
@@ -1,3 +1,4 @@
+{{- if eq .Values.mode "env" }}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -7,7 +8,7 @@ spec:
  serviceAccountName: agh-e2e
  initContainers:
    - name: wait-for-others
-      image: bitnami/kubectl:1.24
+      image: {{ .Values.kubectl.repository }}:{{ .Values.kubectl.tag }}
      command:
        - /bin/bash
        - -c
@@ -19,7 +20,11 @@ spec:
      command:
        - /opt/go/adguardhome-sync
        - run
+      env:
+        - name: LOG_LEVEL
+          value: 'debug'
      envFrom:
        - configMapRef:
            name: sync-conf
  restartPolicy: Never
+  {{- end }}
--- a/testdata/e2e/templates/pod-adguardhome-sync-file.yaml
+++ b/testdata/e2e/templates/pod-adguardhome-sync-file.yaml
@@ -0,0 +1,36 @@
+{{- if eq .Values.mode "file" }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: adguardhome-sync
+  namespace: {{ $.Release.Namespace }}
+spec:
+  serviceAccountName: agh-e2e
+  initContainers:
+    - name: wait-for-others
+      image: {{ .Values.kubectl.repository }}:{{ .Values.kubectl.tag }}
+      command:
+        - /bin/bash
+        - -c
+        - |
+          {{- .Files.Get "bin/wait-for-agh-pods.sh" | nindent 10}}
+  containers:
+    - name: adguardhome-sync
+      image: localhost:5001/adguardhome-sync:e2e
+      command:
+        - /opt/go/adguardhome-sync
+        - run
+        - '--config'
+        - /etc/go/adguardhome-sync/config.yaml
+      env:
+        - name: LOG_LEVEL
+          value: 'debug'
+      volumeMounts:
+        - name: config
+          mountPath: /etc/go/adguardhome-sync/
+  volumes:
+    - name: config
+      configMap:
+        name: sync-conf
+  restartPolicy: Never
+{{- end }}
--- a/testdata/e2e/values.yaml
+++ b/testdata/e2e/values.yaml
@@ -3,3 +3,9 @@ replica:
    - v0.107.40
    - v0.107.43
    - latest
+
+mode: env
+
+kubectl:
+  repository: bitnami/kubectl
+  tag: 1.27
Author	SHA1	Message	Date
bakito	843433e35d	extend dhcp checks #272	2024-01-14 16:13:45 +01:00
bakito	15c651ca96	#272 do not sync dhcp if empty IP	2024-01-14 14:03:04 +01:00
Marc Brugger	4c1e56ccce	Fix config issues with new env library (#273 ) * correct config issues #271 #272 * rename type tags * replace env lib * move to config module * read flags * show e2e logs on error * extract env * replace deprecated env var * increment index * check replica numbers do not start with 0 * remove test suite * error handling * refactor flags * flags test * file test * file test * config tests * extend tests * test mixed mode * simplify * simplify * test mask * correct uniqe replicas * Update types_test.go * e2e test with file mode	2024-01-14 13:29:36 +01:00
bakito	906dfc680a	extend bug issue template wiht 'applied-config'	2024-01-14 09:07:54 +01:00
Marc Brugger	583197f1c8	add deprecated env var table	2024-01-10 20:12:08 +01:00
Marc Brugger	5fca3b1002	better readable env vars (#270 ) * better readable env vars	2024-01-08 19:39:47 +01:00
bakito	1edf5ae52a	add filter test cases	2024-01-08 19:20:31 +01:00
bakito	39f7f41e6d	update readme	2024-01-07 22:44:32 +01:00
Marc Brugger	3139ad605f	Refactor sync into separate action functions (#268 ) * sync-actions * dns rewrites and filters * continue on filter error * servides * client settings * dns * dhcp * remove deprecated env var * fix client tests * tests * copy replica config * map continue on error * map env var with underscore	2024-01-07 22:03:21 +01:00
bakito	a9de069f6b	update dependencies	2024-01-07 10:05:13 +01:00
Marc Brugger	4a8e2aab51	allow definig web URL (#267 )	2024-01-07 09:55:21 +01:00