From 98e5ab47c557ff0cec77c897a36f0ba2e4ca8a2c Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sat, 15 Jul 2017 20:59:55 +0000 Subject: convert todo item into a merge request --- .../sbuild_setup_should_use_apt-cacher-ng.mdwn | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn b/doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn index 450416f2..62f619db 100644 --- a/doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn +++ b/doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn @@ -1,11 +1,20 @@ -The properties in `Sbuild.hs` should use apt-cacher-ng instead of a bind mount of `/var/cache/apt/archives`. This has at least three advantages: +Please consider merging branch `apt-cacher-ng` of repo `https://git.spwhitton.name/propellor`. -1. more than one instance of sbuild can run at once +Sample text for changelog/description of changes: -2. sbuild can run even if apt is doing something else with its cache - -3. the `piupartsConf` properties are no longer needed. + * Add Apt.proxy property to set a host's apt proxy. + * Add Apt.useLocalCacher property to set up apt-cacher-ng. + * Rework Sbuild properties to use apt proxies/cachers instead of bind-mounting + the host's apt cache. This makes it possible to run more than one build at + a time, and lets sbuild run even if apt's cache is locked by the host's apt. + - If Apt.proxy is set, it is assumed that the proxy does some sort of + caching, and sbuild chroots are set up to use the same proxy. + - If Apt.proxy is not set, we install apt-cacher-ng, and point sbuild + chroots at the local apt cacher. + - Drop Sbuild.piupartsConfFor, Sbuild.piupartsConf, Sbuild.shareAptCache + (API change) + No longer needed now that we are using apt proxies/cachers. + - Update sample config in haddock for Propellor.Property.Sbuild. + Please compare both your config.hs and your ~/.sbuildrc against the haddock. --spwhitton - -[[!tag user/spwhitton]] -- cgit v1.3-2-g0d8e From d0b3ae3969fb46e20b57d0b7cc0c2191ddd44c60 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Jul 2017 17:23:05 -0400 Subject: releasing package propellor version 4.3.4 --- debian/changelog | 4 ++-- propellor.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7ec04bc..a60c5f18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (4.3.4) UNRELEASED; urgency=medium +propellor (4.3.4) unstable; urgency=medium * Propellor.Property.Versioned: New module which allows different versions of a property or host to be written down in a propellor config @@ -6,7 +6,7 @@ propellor (4.3.4) UNRELEASED; urgency=medium * LightDM.autoLogin: Use [Seat:*] rather than the old [SeatDefaults]. The new name has been supported since lightdm 1.15. - -- Joey Hess Thu, 13 Jul 2017 15:52:24 -0400 + -- Joey Hess Sat, 15 Jul 2017 17:22:53 -0400 propellor (4.3.3) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index 1bcc1618..733dda3e 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 4.3.3 +Version: 4.3.4 Cabal-Version: >= 1.20 License: BSD2 Maintainer: Joey Hess -- cgit v1.3-2-g0d8e From a0484e58fbf12a21e6d253baae5eccfd5e750a0c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Jul 2017 17:23:24 -0400 Subject: add news item for propellor 4.3.4 --- doc/news/version_4.3.1.mdwn | 4 ---- doc/news/version_4.3.4.mdwn | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 doc/news/version_4.3.1.mdwn create mode 100644 doc/news/version_4.3.4.mdwn diff --git a/doc/news/version_4.3.1.mdwn b/doc/news/version_4.3.1.mdwn deleted file mode 100644 index 5c07307d..00000000 --- a/doc/news/version_4.3.1.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -propellor 4.3.1 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Added Propellor.Property.FreeDesktop module. - * Added reservedSpacePercentage to the PartSpec EDSL."""]] \ No newline at end of file diff --git a/doc/news/version_4.3.4.mdwn b/doc/news/version_4.3.4.mdwn new file mode 100644 index 00000000..5d308401 --- /dev/null +++ b/doc/news/version_4.3.4.mdwn @@ -0,0 +1,7 @@ +propellor 4.3.4 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Propellor.Property.Versioned: New module which allows different + versions of a property or host to be written down in a propellor config + file. Has many applications, including staged upgrades and rollbacks. + * LightDM.autoLogin: Use [Seat:*] rather than the old [SeatDefaults]. + The new name has been supported since lightdm 1.15."""]] \ No newline at end of file -- cgit v1.3-2-g0d8e From 48a72400f5a8336076c50ed005911860e4be1d27 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Jul 2017 18:09:29 -0400 Subject: remove old announcment --- doc/news/Linux.Conf.Au.presentation.mdwn | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 doc/news/Linux.Conf.Au.presentation.mdwn diff --git a/doc/news/Linux.Conf.Au.presentation.mdwn b/doc/news/Linux.Conf.Au.presentation.mdwn deleted file mode 100644 index 54180979..00000000 --- a/doc/news/Linux.Conf.Au.presentation.mdwn +++ /dev/null @@ -1,5 +0,0 @@ - - -[video](http://mirror.linux.org.au/pub/linux.conf.au/2017/Type_driven_configuration_management_with_Propellor.webm) - -Also see this writeup in [Linux Weekly News](https://lwn.net/Articles/713653/) -- cgit v1.3-2-g0d8e From d530acecd938050d1bdd573976f930fb19fe9487 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Jul 2017 18:42:37 -0400 Subject: improve haddock --- src/Propellor/Property/Versioned.hs | 4 ++-- src/Propellor/Types.hs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Propellor/Property/Versioned.hs b/src/Propellor/Property/Versioned.hs index d6517ab9..58d3e8d5 100644 --- a/src/Propellor/Property/Versioned.hs +++ b/src/Propellor/Property/Versioned.hs @@ -18,11 +18,11 @@ -- -- > demo :: Versioned Int (RevertableProperty DebianLike DebianLike) -- > demo ver = --- > ver ( (== 1) --> Apache.modEnabled "foo" +-- > ver ( (== 1) --> Apache.modEnabled "foo" -- > `requires` Apache.modEnabled "foosupport" -- > <|> (== 2) --> Apache.modEnabled "bar" -- > <|> (> 2) --> Apache.modEnabled "baz" --- > ) +-- > ) -- > -- > foo :: Host -- > foo = host "foo.example.com" $ props diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs index 155662c2..b7c7c7f7 100644 --- a/src/Propellor/Types.hs +++ b/src/Propellor/Types.hs @@ -107,6 +107,10 @@ adjustPropertySatisfy (Property t d s i c) f = Property t d (f <$> s) i c -- | A property that can be reverted. The first Property is run -- normally and the second is run when it's reverted. +-- +-- See `Propellor.Property.Versioned.Versioned` +-- for a way to use RevertableProperty to define different +-- versions of a host. data RevertableProperty setupmetatypes undometatypes = RevertableProperty { setupRevertableProperty :: Property setupmetatypes , undoRevertableProperty :: Property undometatypes -- cgit v1.3-2-g0d8e From 4766971105c305ad9d1a6f5145345c892df4a61c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Jul 2017 18:42:44 -0400 Subject: clean up after merge --- config.hs | 2 +- privdata/relocate | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 privdata/relocate diff --git a/config.hs b/config.hs index 97d90636..ec313725 120000 --- a/config.hs +++ b/config.hs @@ -1 +1 @@ -joeyconfig.hs \ No newline at end of file +config-simple.hs \ No newline at end of file diff --git a/privdata/relocate b/privdata/relocate deleted file mode 100644 index 271692d8..00000000 --- a/privdata/relocate +++ /dev/null @@ -1 +0,0 @@ -.joeyconfig -- cgit v1.3-2-g0d8e From 6f2ea4ecc79dc191ec690d57d0cabb19542ddd65 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 15 Jul 2017 17:02:48 -0700 Subject: add Timezone.configured --- src/Propellor/Property/Timezone.hs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/Propellor/Property/Timezone.hs diff --git a/src/Propellor/Property/Timezone.hs b/src/Propellor/Property/Timezone.hs new file mode 100644 index 00000000..91dcbfc6 --- /dev/null +++ b/src/Propellor/Property/Timezone.hs @@ -0,0 +1,19 @@ +-- | Maintainer: Sean Whitton + +module Propellor.Property.Timezone where + +import Propellor.Base +import qualified Propellor.Property.Apt as Apt + +type Timezone = String + +-- | Sets the system's timezone +configured :: Timezone -> Property DebianLike +configured zone = File.hasContent "/etc/timezone" zone + `onChange` update + `describe` (zone ++ " timezone configured") + where + update = Apt.reConfigure "tzdata" mempty + -- work around a bug in recent tzdata. See + -- https://bugs.launchpad.net/ubuntu/+source/tzdata/+bug/1554806/ + `requires` File.notPresent "/etc/localtime" -- cgit v1.3-2-g0d8e From f14958e11eed0c4167972b0d434d251f4c81f7df Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 15 Jul 2017 17:05:26 -0700 Subject: missing import --- src/Propellor/Property/Timezone.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Propellor/Property/Timezone.hs b/src/Propellor/Property/Timezone.hs index 91dcbfc6..896e83fb 100644 --- a/src/Propellor/Property/Timezone.hs +++ b/src/Propellor/Property/Timezone.hs @@ -4,6 +4,7 @@ module Propellor.Property.Timezone where import Propellor.Base import qualified Propellor.Property.Apt as Apt +import qualified Propellor.Property.File as File type Timezone = String -- cgit v1.3-2-g0d8e From 7c91ef33df74808423e28daee9e87b513d278360 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 15 Jul 2017 17:06:44 -0700 Subject: docstring for Timezone type --- src/Propellor/Property/Timezone.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Propellor/Property/Timezone.hs b/src/Propellor/Property/Timezone.hs index 896e83fb..267c4f0b 100644 --- a/src/Propellor/Property/Timezone.hs +++ b/src/Propellor/Property/Timezone.hs @@ -6,6 +6,7 @@ import Propellor.Base import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.File as File +-- | A timezone from /usr/share/zoneinfo type Timezone = String -- | Sets the system's timezone -- cgit v1.3-2-g0d8e From 2d1b302bb29332f6afa602bb4b4a5cca75bf99fd Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 15 Jul 2017 17:06:54 -0700 Subject: fix usage of File.hasContent --- src/Propellor/Property/Timezone.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/Timezone.hs b/src/Propellor/Property/Timezone.hs index 267c4f0b..96a5e59c 100644 --- a/src/Propellor/Property/Timezone.hs +++ b/src/Propellor/Property/Timezone.hs @@ -11,7 +11,7 @@ type Timezone = String -- | Sets the system's timezone configured :: Timezone -> Property DebianLike -configured zone = File.hasContent "/etc/timezone" zone +configured zone = File.hasContent "/etc/timezone" [zone] `onChange` update `describe` (zone ++ " timezone configured") where -- cgit v1.3-2-g0d8e From 6239110550a5ecfd14c905b910fc96deb83ce339 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sun, 16 Jul 2017 00:16:14 +0000 Subject: add merge request --- doc/todo/merge_request:_Timezone.hs.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/todo/merge_request:_Timezone.hs.mdwn diff --git a/doc/todo/merge_request:_Timezone.hs.mdwn b/doc/todo/merge_request:_Timezone.hs.mdwn new file mode 100644 index 00000000..3f67da2c --- /dev/null +++ b/doc/todo/merge_request:_Timezone.hs.mdwn @@ -0,0 +1,7 @@ +Please consider merging branch `timezone` of repo `https://git.spwhitton.name/propellor`. + +Adds `Timezone.configured`. + +I think that this works fine on stretch, but on Jessie there is some oddness. For example, if you set the timezone of a host to `US/Arizona`, the apt reconfiguration will put `America/Phoenix` in /etc/timezone, resulting in the property reporting a change every time that it is run. I think this is harmless. + +--spwhitton -- cgit v1.3-2-g0d8e From cb885b8a925fcaaec3e3685fc5cd4c369593afef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Jul 2017 12:10:34 -0400 Subject: Propellor.Property.Timezone: New module, contributed by Sean Whitton. --- debian/changelog | 6 ++++++ doc/todo/merge_request:_Timezone.hs.mdwn | 2 ++ .../comment_1_9cfb5e48940e58f2064cbb5edf462c06._comment | 15 +++++++++++++++ propellor.cabal | 1 + 4 files changed, 24 insertions(+) create mode 100644 doc/todo/merge_request:_Timezone.hs/comment_1_9cfb5e48940e58f2064cbb5edf462c06._comment diff --git a/debian/changelog b/debian/changelog index a60c5f18..517151d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (4.3.5) UNRELEASED; urgency=medium + + * Propellor.Property.Timezone: New module, contributed by Sean Whitton. + + -- Joey Hess Sun, 16 Jul 2017 12:07:15 -0400 + propellor (4.3.4) unstable; urgency=medium * Propellor.Property.Versioned: New module which allows different diff --git a/doc/todo/merge_request:_Timezone.hs.mdwn b/doc/todo/merge_request:_Timezone.hs.mdwn index 3f67da2c..a8ba3eae 100644 --- a/doc/todo/merge_request:_Timezone.hs.mdwn +++ b/doc/todo/merge_request:_Timezone.hs.mdwn @@ -5,3 +5,5 @@ Adds `Timezone.configured`. I think that this works fine on stretch, but on Jessie there is some oddness. For example, if you set the timezone of a host to `US/Arizona`, the apt reconfiguration will put `America/Phoenix` in /etc/timezone, resulting in the property reporting a change every time that it is run. I think this is harmless. --spwhitton + +> [[merged|done]] --[[Joey]] diff --git a/doc/todo/merge_request:_Timezone.hs/comment_1_9cfb5e48940e58f2064cbb5edf462c06._comment b/doc/todo/merge_request:_Timezone.hs/comment_1_9cfb5e48940e58f2064cbb5edf462c06._comment new file mode 100644 index 00000000..026b13de --- /dev/null +++ b/doc/todo/merge_request:_Timezone.hs/comment_1_9cfb5e48940e58f2064cbb5edf462c06._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-07-16T15:57:20Z" + content=""" +I generally consider properties that do work every time to be a minor bug. + +I wonder if it would be better to preseed tzdata rather than writing the +config file. I observe the same substitution from eg, US/Eastern to +America/New_York in the file when reconfiguring noninteractively, +but reconfiguring interactively I can select US/Eastern and that gets +into the file. + +Anyway, merged as this is certianly a good starting point. +"""]] diff --git a/propellor.cabal b/propellor.cabal index 733dda3e..43a3ab5e 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -150,6 +150,7 @@ Library Propellor.Property.Sudo Propellor.Property.Systemd Propellor.Property.Systemd.Core + Propellor.Property.Timezone Propellor.Property.Tor Propellor.Property.Unbound Propellor.Property.User -- cgit v1.3-2-g0d8e From b6d650730be9369b89623f46cb773dcc880630cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Jul 2017 12:42:31 -0400 Subject: Propellor.Property.Sudo.enabledFor: Made revertable (minor API change) This commit was sponsored by Henrik Riomar on Patreon. --- debian/changelog | 4 +++- propellor.cabal | 2 +- src/Propellor/Property/Sudo.hs | 24 +++++++++++++++++------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 517151d8..d70018cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -propellor (4.3.5) UNRELEASED; urgency=medium +propellor (4.4.0) UNRELEASED; urgency=medium * Propellor.Property.Timezone: New module, contributed by Sean Whitton. + * Propellor.Property.Sudo.enabledFor: Made revertable. + (minor API change) -- Joey Hess Sun, 16 Jul 2017 12:07:15 -0400 diff --git a/propellor.cabal b/propellor.cabal index 43a3ab5e..d4417578 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 4.3.4 +Version: 4.4.0 Cabal-Version: >= 1.20 License: BSD2 Maintainer: Joey Hess diff --git a/src/Propellor/Property/Sudo.hs b/src/Propellor/Property/Sudo.hs index 45ab8af2..1614801d 100644 --- a/src/Propellor/Property/Sudo.hs +++ b/src/Propellor/Property/Sudo.hs @@ -9,23 +9,33 @@ import Propellor.Property.User -- | Allows a user to sudo. If the user has a password, sudo is configured -- to require it. If not, NOPASSWORD is enabled for the user. -enabledFor :: User -> Property DebianLike -enabledFor user@(User u) = go `requires` Apt.installed ["sudo"] +enabledFor :: User -> RevertableProperty DebianLike DebianLike +enabledFor user@(User u) = setup `requires` Apt.installed ["sudo"] cleanup where - go :: Property UnixLike - go = property' desc $ \w -> do + setup :: Property UnixLike + setup = property' desc $ \w -> do locked <- liftIO $ isLockedPassword user ensureProperty w $ fileProperty desc (modify locked . filter (wanted locked)) - "/etc/sudoers" - desc = u ++ " is sudoer" + sudoers + where + desc = u ++ " is sudoer" + + cleanup :: Property DebianLike + cleanup = tightenTargets $ + fileProperty desc (filter notuserline) sudoers + where + desc = u ++ " is not sudoer" + + sudoers = "/etc/sudoers" sudobaseline = u ++ " ALL=(ALL:ALL)" + notuserline l = not (sudobaseline `isPrefixOf` l) sudoline True = sudobaseline ++ " NOPASSWD:ALL" sudoline False = sudobaseline ++ " ALL" wanted locked l -- TOOD: Full sudoers file format parse.. - | not (sudobaseline `isPrefixOf` l) = True + | notuserline l = True | "NOPASSWD" `isInfixOf` l = locked | otherwise = True modify locked ls -- cgit v1.3-2-g0d8e From 1522d270077abad43a6d8d7fea2bd8163ed912fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Jul 2017 12:51:40 -0400 Subject: Propellor.Property.LightDM.autoLogin: Made revertable. * Propellor.Property.LightDM.autoLogin: Made revertable. (minor API change) * Propellor.Property.Conffile: Added lacksIniSetting. This commit was sponsored by Jack Hill on Patreon. --- debian/changelog | 3 +++ src/Propellor/Property/ConfFile.hs | 14 ++++++++++++++ src/Propellor/Property/LightDM.hs | 14 +++++++++----- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d70018cc..e8b0358c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ propellor (4.4.0) UNRELEASED; urgency=medium * Propellor.Property.Timezone: New module, contributed by Sean Whitton. * Propellor.Property.Sudo.enabledFor: Made revertable. (minor API change) + * Propellor.Property.LightDM.autoLogin: Made revertable. + (minor API change) + * Propellor.Property.Conffile: Added lacksIniSetting. -- Joey Hess Sun, 16 Jul 2017 12:07:15 -0400 diff --git a/src/Propellor/Property/ConfFile.hs b/src/Propellor/Property/ConfFile.hs index ce092ec9..76d52bd9 100644 --- a/src/Propellor/Property/ConfFile.hs +++ b/src/Propellor/Property/ConfFile.hs @@ -9,6 +9,7 @@ module Propellor.Property.ConfFile ( IniSection, IniKey, containsIniSetting, + lacksIniSetting, hasIniSection, lacksIniSection, iniFileContains, @@ -93,6 +94,19 @@ containsIniSetting f (header, key, value) = adjustIniSection go (l:ls) = if isKeyVal l then confline : ls else l : go ls isKeyVal x = (filter (/= ' ') . takeWhile (/= '=')) x `elem` [key, '#':key] +-- | Removes a key=value setting from a section of an .ini file. +-- Note that the section heading is left in the file, so this is not a +-- perfect reversion of containsIniSetting. +lacksIniSetting :: FilePath -> (IniSection, IniKey, String) -> Property UnixLike +lacksIniSetting f (header, key, value) = adjustIniSection + (f ++ " section [" ++ header ++ "] lacks " ++ key ++ "=" ++ value) + header + (filter (/= confline)) + id + f + where + confline = key ++ "=" ++ value + -- | Ensures that a .ini file exists and contains a section -- with a given key=value list of settings. hasIniSection :: FilePath -> IniSection -> [(IniKey, String)] -> Property UnixLike diff --git a/src/Propellor/Property/LightDM.hs b/src/Propellor/Property/LightDM.hs index 44f0e9f0..d471d314 100644 --- a/src/Propellor/Property/LightDM.hs +++ b/src/Propellor/Property/LightDM.hs @@ -10,8 +10,12 @@ installed :: Property DebianLike installed = Apt.installed ["lightdm"] -- | Configures LightDM to skip the login screen and autologin as a user. -autoLogin :: User -> Property DebianLike -autoLogin (User u) = "/etc/lightdm/lightdm.conf" `ConfFile.containsIniSetting` - ("Seat:*", "autologin-user", u) - `describe` "lightdm autologin" - `requires` installed +autoLogin :: User -> RevertableProperty DebianLike DebianLike +autoLogin (User u) = (setup cleanup) + `describe` ("lightdm autologin for " ++ u) + where + cf = "/etc/lightdm/lightdm.conf" + setting = ("Seat:*", "autologin-user", u) + setup = cf `ConfFile.containsIniSetting` setting + `requires` installed + cleanup = tightenTargets $ cf `ConfFile.lacksIniSetting` setting -- cgit v1.3-2-g0d8e From 23d49eab939314edd4bfe4e762faaefd5966420e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Jul 2017 12:55:05 -0400 Subject: releasing package propellor version 4.4.0 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8b0358c..986dfd75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (4.4.0) UNRELEASED; urgency=medium +propellor (4.4.0) unstable; urgency=medium * Propellor.Property.Timezone: New module, contributed by Sean Whitton. * Propellor.Property.Sudo.enabledFor: Made revertable. @@ -7,7 +7,7 @@ propellor (4.4.0) UNRELEASED; urgency=medium (minor API change) * Propellor.Property.Conffile: Added lacksIniSetting. - -- Joey Hess Sun, 16 Jul 2017 12:07:15 -0400 + -- Joey Hess Mon, 17 Jul 2017 12:55:02 -0400 propellor (4.3.4) unstable; urgency=medium -- cgit v1.3-2-g0d8e From 44d8214f5f5a52c63e52d2f7538f8ab5e36cdd8f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Jul 2017 12:55:28 -0400 Subject: add news item for propellor 4.4.0 --- doc/news/version_4.3.2.mdwn | 3 --- doc/news/version_4.4.0.mdwn | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 doc/news/version_4.3.2.mdwn create mode 100644 doc/news/version_4.4.0.mdwn diff --git a/doc/news/version_4.3.2.mdwn b/doc/news/version_4.3.2.mdwn deleted file mode 100644 index 1a85d2d4..00000000 --- a/doc/news/version_4.3.2.mdwn +++ /dev/null @@ -1,3 +0,0 @@ -propellor 4.3.2 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Really include Propellor.Property.FreeDesktop."""]] \ No newline at end of file diff --git a/doc/news/version_4.4.0.mdwn b/doc/news/version_4.4.0.mdwn new file mode 100644 index 00000000..db86c536 --- /dev/null +++ b/doc/news/version_4.4.0.mdwn @@ -0,0 +1,8 @@ +propellor 4.4.0 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Propellor.Property.Timezone: New module, contributed by Sean Whitton. + * Propellor.Property.Sudo.enabledFor: Made revertable. + (minor API change) + * Propellor.Property.LightDM.autoLogin: Made revertable. + (minor API change) + * Propellor.Property.Conffile: Added lacksIniSetting."""]] \ No newline at end of file -- cgit v1.3-2-g0d8e From c987a3a3bd14171071b85c5937773a47b23859ff Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Jul 2017 13:41:26 -0400 Subject: todo --- ...erty.Versioned_support_asymmetric_RevertableProperty_types.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/todo/Propellor.Property.Versioned_support_asymmetric_RevertableProperty_types.mdwn diff --git a/doc/todo/Propellor.Property.Versioned_support_asymmetric_RevertableProperty_types.mdwn b/doc/todo/Propellor.Property.Versioned_support_asymmetric_RevertableProperty_types.mdwn new file mode 100644 index 00000000..c60cd4d6 --- /dev/null +++ b/doc/todo/Propellor.Property.Versioned_support_asymmetric_RevertableProperty_types.mdwn @@ -0,0 +1,7 @@ +Currently, this module requires `RevertableProperty t t`. +That can be annoying, it would be good to support at least +`RevertablePropery (HasInfo + t) t` and ideally all +`RevertableProperty t1 t2` + +There should be no reason that can't be done; I was just having +problems getting the type checker happy on the day I wrote it. --[[Joey]] -- cgit v1.3-2-g0d8e