summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--doc/todo/merge_request:_Timezone.hs.mdwn2
-rw-r--r--doc/todo/merge_request:_Timezone.hs/comment_1_9cfb5e48940e58f2064cbb5edf462c06._comment15
-rw-r--r--propellor.cabal1
4 files changed, 24 insertions, 0 deletions
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 <id@joeyh.name> 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