summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/forum/How_can_File.mode_be_used_in_config.hs___63__/comment_1_c176c1507c6f08917b4e5d2a70b19ee4._comment11
-rw-r--r--src/Propellor/Git/VerifiedBranch.hs1
-rw-r--r--src/Propellor/Property/Bootstrap.hs1
-rw-r--r--src/Propellor/Property/Ccache.hs1
-rw-r--r--src/Propellor/Property/Cron.hs1
-rw-r--r--src/Propellor/Property/Debootstrap.hs1
-rw-r--r--src/Propellor/Property/DiskImage.hs1
-rw-r--r--src/Propellor/Property/File.hs1
-rw-r--r--src/Propellor/Property/HostingProvider/Linode.hs1
-rw-r--r--src/Propellor/Property/Openssl.hs2
-rw-r--r--src/Propellor/Property/Sbuild.hs1
-rw-r--r--src/Propellor/Property/Schroot.hs2
-rw-r--r--src/Propellor/Property/Service.hs1
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs1
-rw-r--r--src/Propellor/Property/Ssh.hs1
-rw-r--r--src/Propellor/Property/Systemd.hs1
-rw-r--r--src/Propellor/Property/Tor.hs1
-rw-r--r--src/Propellor/Shim.hs1
-rw-r--r--src/Propellor/Spin.hs1
-rw-r--r--src/Propellor/Utilities.hs2
21 files changed, 15 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 73540dfe..87e924e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ propellor (5.7.0) UNRELEASED; urgency=medium
To upgrade: Simply add Sbuild.osDebianStandard to all Sbuild.built
calls which have osDebian.
Thanks, Sean Whitton
+ * Added Utility.FileMode to the modules exported by Propellor.Utilities
+ to propellor library users.
-- Joey Hess <id@joeyh.name> Mon, 01 Apr 2019 11:35:15 -0400
diff --git a/doc/forum/How_can_File.mode_be_used_in_config.hs___63__/comment_1_c176c1507c6f08917b4e5d2a70b19ee4._comment b/doc/forum/How_can_File.mode_be_used_in_config.hs___63__/comment_1_c176c1507c6f08917b4e5d2a70b19ee4._comment
new file mode 100644
index 00000000..da031715
--- /dev/null
+++ b/doc/forum/How_can_File.mode_be_used_in_config.hs___63__/comment_1_c176c1507c6f08917b4e5d2a70b19ee4._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2019-04-01T15:49:26Z"
+ content="""
+Yes, you'll need to add a dependency on `unix` to get access to that.
+
+This does seem like an oversight, so I made Propellor.Utilities re-export
+it. But, I think I'd personally choose the dependency on `unix` instead
+of relying on that module, which does not guarantee any API stability.
+"""]]
diff --git a/src/Propellor/Git/VerifiedBranch.hs b/src/Propellor/Git/VerifiedBranch.hs
index 61f5baa0..408e0200 100644
--- a/src/Propellor/Git/VerifiedBranch.hs
+++ b/src/Propellor/Git/VerifiedBranch.hs
@@ -3,7 +3,6 @@ module Propellor.Git.VerifiedBranch where
import Propellor.Base
import Propellor.Git
import Propellor.PrivData.Paths
-import Utility.FileMode
{- To verify origin branch commit's signature, have to convince gpg
- to use our keyring while running git verify-tag.
diff --git a/src/Propellor/Property/Bootstrap.hs b/src/Propellor/Property/Bootstrap.hs
index 25a6af33..6bbb4512 100644
--- a/src/Propellor/Property/Bootstrap.hs
+++ b/src/Propellor/Property/Bootstrap.hs
@@ -15,7 +15,6 @@ import Propellor.Bootstrap
import Propellor.Types.Info
import Propellor.Property.Chroot
import Propellor.PrivData.Paths
-import Utility.FileMode
import Data.List
import qualified Data.ByteString as B
diff --git a/src/Propellor/Property/Ccache.hs b/src/Propellor/Property/Ccache.hs
index ea729b7c..fad3a28f 100644
--- a/src/Propellor/Property/Ccache.hs
+++ b/src/Propellor/Property/Ccache.hs
@@ -11,7 +11,6 @@ import Propellor.Base
import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apt as Apt
-import Utility.FileMode
import Utility.DataUnits
import System.Posix.Files
import qualified Data.Semigroup as Sem
diff --git a/src/Propellor/Property/Cron.hs b/src/Propellor/Property/Cron.hs
index b9fb10e0..0271b0b3 100644
--- a/src/Propellor/Property/Cron.hs
+++ b/src/Propellor/Property/Cron.hs
@@ -4,7 +4,6 @@ import Propellor.Base
import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apt as Apt
import Propellor.Bootstrap
-import Utility.FileMode
import Data.Char
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs
index 923229be..6336e775 100644
--- a/src/Propellor/Property/Debootstrap.hs
+++ b/src/Propellor/Property/Debootstrap.hs
@@ -15,7 +15,6 @@ import qualified Propellor.Property.Apt as Apt
import Propellor.Property.Chroot.Util
import Propellor.Property.Qemu
import Utility.Path
-import Utility.FileMode
import Data.List
import Data.Char
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index 29bc2d1c..b7651b98 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -42,7 +42,6 @@ import Propellor.Types.Info
import Propellor.Types.Bootloader
import Propellor.Container
import Utility.Path
-import Utility.FileMode
import Utility.DataUnits
import Data.List (isPrefixOf, isInfixOf, sortBy, unzip4)
diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs
index 3188879e..e6d657f9 100644
--- a/src/Propellor/Property/File.hs
+++ b/src/Propellor/Property/File.hs
@@ -3,7 +3,6 @@
module Propellor.Property.File where
import Propellor.Base
-import Utility.FileMode
import qualified Data.ByteString.Lazy as L
import Data.List (isInfixOf, isPrefixOf)
diff --git a/src/Propellor/Property/HostingProvider/Linode.hs b/src/Propellor/Property/HostingProvider/Linode.hs
index ebe8d261..fc5d1a0c 100644
--- a/src/Propellor/Property/HostingProvider/Linode.hs
+++ b/src/Propellor/Property/HostingProvider/Linode.hs
@@ -3,7 +3,6 @@ module Propellor.Property.HostingProvider.Linode where
import Propellor.Base
import qualified Propellor.Property.Grub as Grub
import qualified Propellor.Property.File as File
-import Utility.FileMode
-- | Configures grub to use the serial console as set up by Linode.
-- Useful when running a distribution supplied kernel.
diff --git a/src/Propellor/Property/Openssl.hs b/src/Propellor/Property/Openssl.hs
index a91b8195..0cb7c9c2 100644
--- a/src/Propellor/Property/Openssl.hs
+++ b/src/Propellor/Property/Openssl.hs
@@ -5,10 +5,8 @@ module Propellor.Property.Openssl where
import Propellor.Base
import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.File as File
-import Utility.FileMode
import Utility.SafeCommand
-
installed :: Property DebianLike
installed = Apt.installed ["openssl"]
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index fbd3da7a..b54f8170 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -89,7 +89,6 @@ import qualified Propellor.Property.File as File
import qualified Propellor.Property.Schroot as Schroot
import qualified Propellor.Property.Reboot as Reboot
import qualified Propellor.Property.User as User
-import Utility.FileMode
import Data.List
diff --git a/src/Propellor/Property/Schroot.hs b/src/Propellor/Property/Schroot.hs
index 2f399b7c..82afdc79 100644
--- a/src/Propellor/Property/Schroot.hs
+++ b/src/Propellor/Property/Schroot.hs
@@ -9,8 +9,6 @@ import Propellor.Types.Info
import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apt as Apt
-import Utility.FileMode
-
data UseOverlays = UseOverlays deriving (Eq, Show, Typeable)
-- | Indicate that a schroots on a host should use @union-type=overlay@
diff --git a/src/Propellor/Property/Service.hs b/src/Propellor/Property/Service.hs
index 1c230ce0..396fbaf1 100644
--- a/src/Propellor/Property/Service.hs
+++ b/src/Propellor/Property/Service.hs
@@ -5,7 +5,6 @@ module Propellor.Property.Service where
import Propellor.Base
import Propellor.Types.Info
import qualified Propellor.Property.File as File
-import Utility.FileMode
type ServiceName = String
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index e3dbbabd..c5cfbc71 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -25,7 +25,6 @@ import qualified Propellor.Property.Network as Network
import qualified Propellor.Property.Fail2Ban as Fail2Ban
import qualified Propellor.Property.LetsEncrypt as LetsEncrypt
import qualified Propellor.Property.Mount as Mount
-import Utility.FileMode
import Utility.Split
import Data.List
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index c23a121b..59698ec0 100644
--- a/src/Propellor/Property/Ssh.hs
+++ b/src/Propellor/Property/Ssh.hs
@@ -40,7 +40,6 @@ import qualified Propellor.Property.Service as Service
import qualified Propellor.Property.Apt as Apt
import Propellor.Property.User
import Propellor.Types.Info
-import Utility.FileMode
import System.PosixCompat
import qualified Data.Map as M
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 9c9f5914..9e9a1de1 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -55,7 +55,6 @@ import qualified Propellor.Property.Chroot as Chroot
import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.File as File
import Propellor.Property.Systemd.Core
-import Utility.FileMode
import Utility.Split
import Data.List
diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs
index 8794bc7f..426d4209 100644
--- a/src/Propellor/Property/Tor.hs
+++ b/src/Propellor/Property/Tor.hs
@@ -7,7 +7,6 @@ import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.Service as Service
import qualified Propellor.Property.ConfFile as ConfFile
-import Utility.FileMode
import Utility.DataUnits
import System.Posix.Files
diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs
index b8ebdf46..2c5aaa5e 100644
--- a/src/Propellor/Shim.hs
+++ b/src/Propellor/Shim.hs
@@ -8,7 +8,6 @@ module Propellor.Shim (setup, cleanEnv, file) where
import Propellor.Base
import Utility.LinuxMkLibs
-import Utility.FileMode
import Data.List
import System.Posix.Files
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index 4a945e82..1fb4d7e4 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -31,7 +31,6 @@ import Propellor.Types.CmdLine
import Propellor.Types.Info
import Propellor.Property.PropellorRepo (OriginUrl(..))
import qualified Propellor.Shim as Shim
-import Utility.FileMode
import Utility.SafeCommand
import Utility.Process.NonConcurrent
diff --git a/src/Propellor/Utilities.hs b/src/Propellor/Utilities.hs
index 56e7f2fb..289f3206 100644
--- a/src/Propellor/Utilities.hs
+++ b/src/Propellor/Utilities.hs
@@ -19,6 +19,7 @@ module Propellor.Utilities (
, module Utility.Tmp.Dir
, module Utility.Monad
, module Utility.Misc
+ , module Utility.FileMode
) where
import Utility.PartialPrelude
@@ -33,3 +34,4 @@ import Utility.Tmp
import Utility.Tmp.Dir
import Utility.Monad
import Utility.Misc
+import Utility.FileMode