diff options
6 files changed, 26 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 8d9179e4..659bd8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ propellor (5.4.1) UNRELEASED; urgency=medium
method of parsing git log output. Needs git 2.0.
* Added ConfFile.containsShellSetting, ConfFile.lacksShellSetting,
and EtcDefault.set properties. Thanks, Sean Whitton
+ * Docker and HostingProvider.CloudAtCost modules are not being
+ maintained, so marked them as such, including build-time warnings.
+ Seeking a maintainer for the Docker module; I anticipate
+ removing the CloudAtCost module in the next API bump.
-- Joey Hess <> Fri, 18 May 2018 10:25:05 -0400
diff --git a/doc/todo/Outdated_Docker_Package__63__/comment_1_408c060bcec73880502655c333a2ea40._comment b/doc/todo/Outdated_Docker_Package__63__/comment_1_408c060bcec73880502655c333a2ea40._comment
index 6f06f87f..bf75470b 100644
--- a/doc/todo/Outdated_Docker_Package__63__/comment_1_408c060bcec73880502655c333a2ea40._comment
+++ b/doc/todo/Outdated_Docker_Package__63__/comment_1_408c060bcec73880502655c333a2ea40._comment
@@ -4,8 +4,9 @@
I can't see any docker-engine package in any version of Debian. Unstable
-still has a, though testing does not. It looks like perhaps
-docker was not included in the last stable release, though I am not sure.
+still has a, though testing does not (update: it does now; the
+docker package also recently got updated to a more current version).
+Docker was not included in the last stable release.
I have not used docker in quite some time. I use systemd-nspawn containers
which are much easier to build and maintain. So, it may make sense to
diff --git a/doc/todo/Outdated_Docker_Package__63__/comment_2_8da1d2a1a6e6569a2197ab867665dad1._comment b/doc/todo/Outdated_Docker_Package__63__/comment_2_8da1d2a1a6e6569a2197ab867665dad1._comment
new file mode 100644
index 00000000..e0f14b92
--- /dev/null
+++ b/doc/todo/Outdated_Docker_Package__63__/comment_2_8da1d2a1a6e6569a2197ab867665dad1._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2018-07-11T16:01:37Z"
+ content="""
+Marked the module as unmaintained. If you would like to take over
+maintanance of it, just send me patches putting your name in the maintainer
+slot etc.
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 0d971b03..7541c78b 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -33,7 +33,6 @@ import qualified Propellor.Property.Systemd as Systemd
import qualified Propellor.Property.Journald as Journald
import qualified Propellor.Property.Fail2Ban as Fail2Ban
import qualified Propellor.Property.Laptop as Laptop
-import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost
import qualified Propellor.Property.HostingProvider.Linode as Linode
import qualified Propellor.Property.HostingProvider.DigitalOcean as DigitalOcean
import qualified Propellor.Property.SiteSpecific.GitHome as GitHome
@@ -101,7 +100,6 @@ clam = host "" $ props
["Unreliable server. Anything here may be lost at any time!" ]
& ipv4 ""
- & CloudAtCost.decruft
& User.hasPassword (User "root")
& Ssh.hostKeys hostContext
[ (SshDsa, "ssh-dss AAAAB3NzaC1kc3MAAACBAI3WUq0RaigLlcUivgNG4sXpso2ORZkMvfqKz6zkc60L6dpxvWDNmZVEH8hEjxRSYG07NehcuOgQqeyFnS++xw1hdeGjf37JqCUH49i02lra3Zxv8oPpRxyeqe5MmuzUJhlWvBdlc3O/nqZ4bTUfnxMzSYWyy6++s/BpSHttZplNAAAAFQC1DE0vzgVeNAv9smHLObQWZFe2VQAAAIBECtpJry3GC8NVTFsTHDGWksluoFPIbKiZUFFztZGdM0AO2VwAbiJ6Au6M3VddGFANgTlni6d2/9yS919zO90TaFoIjywZeXhxE2CSuRfU7sx2hqDBk73jlycem/ER0sanFhzpHVpwmLfWneTXImWyq37vhAxatJANOtbj81vQ3AAAAIBV3lcyTT9xWg1Q4vERJbvyF8mCliwZmnIPa7ohveKkxlcgUk5d6dnaqFfjVaiXBPN3Qd08WXoQ/a9k3chBPT9nW2vWgzzM8l36j2MbHLmaxGwevAc9+vx4MXqvnGHzd2ex950mC33ct3j0fzMZlO6vqEsgD4CYmiASxhfefj+JCQ==")
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 66418253..522aecd9 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -1,11 +1,14 @@
{-# LANGUAGE FlexibleContexts, TypeSynonymInstances, FlexibleInstances, TypeFamilies #-}
--- | Docker support for propellor
+-- | Maintainer: currently unmaintained; your name here!
+-- Docker support for propellor
-- The existance of a docker container is just another Property of a system,
-- which propellor can set up. See config.hs for an example.
-module Propellor.Property.Docker (
+module Propellor.Property.Docker
+ {-# WARNING "This module does not have a maintainer. It might not work right anymore. If you use it, please consider becoming its maintainer." #-} (
-- * Host properties
diff --git a/src/Propellor/Property/HostingProvider/CloudAtCost.hs b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
index 5c4788e2..48c19572 100644
--- a/src/Propellor/Property/HostingProvider/CloudAtCost.hs
+++ b/src/Propellor/Property/HostingProvider/CloudAtCost.hs
@@ -1,4 +1,8 @@
-module Propellor.Property.HostingProvider.CloudAtCost where
+-- | Maintainer: currently unmaintained; your name here!
+module Propellor.Property.HostingProvider.CloudAtCost
+ {-# WARNING "This module does not have a maintainer. It might not work right anymore. If you use it, please consider becoming its maintainer." #-}
+ where
import Propellor.Base
import qualified Propellor.Property.Hostname as Hostname