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(-) (limited to 'doc') 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 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 (limited to 'doc') 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 (limited to 'doc') 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 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 (limited to 'doc') 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 (limited to 'doc') 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 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 (limited to 'doc') 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 (limited to 'doc') 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