diff --git a/agent/config/settings.yml b/agent/config/settings.yml index 1af22f3de..d7996e304 100644 --- a/agent/config/settings.yml +++ b/agent/config/settings.yml @@ -34,6 +34,6 @@ database: database: "start9_agent.sqlite3" poolsize: "_env:YESOD_SQLITE_POOLSIZE:10" -app-mgr-version-spec: "=0.2.6" +app-mgr-version-spec: "=0.2.7" #analytics: UA-YOURCODE diff --git a/agent/migrations/0.2.6::0.2.7 b/agent/migrations/0.2.6::0.2.7 new file mode 100644 index 000000000..b928005e2 --- /dev/null +++ b/agent/migrations/0.2.6::0.2.7 @@ -0,0 +1 @@ +SELECT TRUE; \ No newline at end of file diff --git a/agent/package.yaml b/agent/package.yaml index ee7c00ab2..64e24ae43 100644 --- a/agent/package.yaml +++ b/agent/package.yaml @@ -1,5 +1,5 @@ name: ambassador-agent -version: 0.2.6 +version: 0.2.7 default-extensions: - NoImplicitPrelude diff --git a/agent/src/Lib/Synchronizers.hs b/agent/src/Lib/Synchronizers.hs index 8690404d9..edb4b7a1a 100644 --- a/agent/src/Lib/Synchronizers.hs +++ b/agent/src/Lib/Synchronizers.hs @@ -95,12 +95,12 @@ parseKernelVersion = do pure $ KernelVersion (Version (major', minor', patch', 0)) arch synchronizer :: Synchronizer -synchronizer = sync_0_2_6 +synchronizer = sync_0_2_7 {-# INLINE synchronizer #-} -sync_0_2_6 :: Synchronizer -sync_0_2_6 = Synchronizer - "0.2.6" +sync_0_2_7 :: Synchronizer +sync_0_2_7 = Synchronizer + "0.2.7" [ syncCreateAgentTmp , syncCreateSshDir , syncRemoveAvahiSystemdDependency @@ -541,10 +541,11 @@ syncRestarterService :: SyncOp syncRestarterService = SyncOp "Install Restarter Service" check migrate False where wantedService = $(embedFile "config/restarter.service") - wantedTimer = $(embedFile "config/restarter.timer") - check = do + wantedTimer = $(embedFile "config/restarter.timer") + check = do base <- asks $ appFilesystemBase . appSettings - liftIO $ not <$> doesPathExist (toS $ "/etc/systemd/system/timers.target.wants/restarter.timer" `relativeTo` base) + liftIO $ not <$> doesPathExist + (toS $ "/etc/systemd/system/timers.target.wants/restarter.timer" `relativeTo` base) migrate = do base <- asks $ appFilesystemBase . appSettings liftIO $ BS.writeFile (toS $ "/etc/systemd/system/restarter.service" `relativeTo` base) wantedService