From 7115d1ec162b4059b3e8e8f84bd8d5898c1db025 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 14 May 2014 19:41:05 -0400 Subject: [PATCH] moved source code to src This is to work around OSX's brain-damange regarding filename case insensitivity. Avoided moving config.hs, because it's a config file. Put in a symlink to make build work. --- propellor.cabal | 5 ++++- Propellor.hs => src/Propellor.hs | 0 {Propellor => src/Propellor}/Attr.hs | 0 {Propellor => src/Propellor}/CmdLine.hs | 0 {Propellor => src/Propellor}/Engine.hs | 0 {Propellor => src/Propellor}/Exception.hs | 0 {Propellor => src/Propellor}/Message.hs | 0 {Propellor => src/Propellor}/PrivData.hs | 0 {Propellor => src/Propellor}/Property.hs | 0 {Propellor => src/Propellor}/Property/Apache.hs | 0 {Propellor => src/Propellor}/Property/Apt.hs | 0 {Propellor => src/Propellor}/Property/Cmd.hs | 0 {Propellor => src/Propellor}/Property/Cron.hs | 0 {Propellor => src/Propellor}/Property/Dns.hs | 0 {Propellor => src/Propellor}/Property/Docker.hs | 0 {Propellor => src/Propellor}/Property/Docker/Shim.hs | 0 {Propellor => src/Propellor}/Property/File.hs | 0 {Propellor => src/Propellor}/Property/Git.hs | 0 {Propellor => src/Propellor}/Property/Gpg.hs | 0 {Propellor => src/Propellor}/Property/Hostname.hs | 0 {Propellor => src/Propellor}/Property/Network.hs | 0 {Propellor => src/Propellor}/Property/Obnam.hs | 0 {Propellor => src/Propellor}/Property/OpenId.hs | 0 {Propellor => src/Propellor}/Property/Postfix.hs | 0 {Propellor => src/Propellor}/Property/Reboot.hs | 0 {Propellor => src/Propellor}/Property/Scheduled.hs | 0 {Propellor => src/Propellor}/Property/Service.hs | 0 .../Propellor}/Property/SiteSpecific/GitAnnexBuilder.hs | 0 .../Propellor}/Property/SiteSpecific/GitHome.hs | 0 .../Propellor}/Property/SiteSpecific/JoeySites.hs | 0 {Propellor => src/Propellor}/Property/Ssh.hs | 0 {Propellor => src/Propellor}/Property/Sudo.hs | 0 {Propellor => src/Propellor}/Property/Tor.hs | 0 {Propellor => src/Propellor}/Property/User.hs | 0 {Propellor => src/Propellor}/SimpleSh.hs | 0 {Propellor => src/Propellor}/Types.hs | 0 {Propellor => src/Propellor}/Types/Attr.hs | 0 {Propellor => src/Propellor}/Types/Dns.hs | 0 {Propellor => src/Propellor}/Types/OS.hs | 0 {Utility => src/Utility}/Applicative.hs | 0 {Utility => src/Utility}/Data.hs | 0 {Utility => src/Utility}/Directory.hs | 0 {Utility => src/Utility}/Env.hs | 0 {Utility => src/Utility}/Exception.hs | 0 {Utility => src/Utility}/FileMode.hs | 0 {Utility => src/Utility}/FileSystemEncoding.hs | 0 {Utility => src/Utility}/LinuxMkLibs.hs | 0 {Utility => src/Utility}/Misc.hs | 0 {Utility => src/Utility}/Monad.hs | 0 {Utility => src/Utility}/PartialPrelude.hs | 0 {Utility => src/Utility}/Path.hs | 0 {Utility => src/Utility}/PosixFiles.hs | 0 {Utility => src/Utility}/Process.hs | 0 {Utility => src/Utility}/QuickCheck.hs | 0 {Utility => src/Utility}/SafeCommand.hs | 0 {Utility => src/Utility}/Scheduled.hs | 0 {Utility => src/Utility}/ThreadScheduler.hs | 0 {Utility => src/Utility}/Tmp.hs | 0 {Utility => src/Utility}/UserInfo.hs | 0 src/config.hs | 1 + wrapper.hs => src/wrapper.hs | 0 61 files changed, 5 insertions(+), 1 deletion(-) rename Propellor.hs => src/Propellor.hs (100%) rename {Propellor => src/Propellor}/Attr.hs (100%) rename {Propellor => src/Propellor}/CmdLine.hs (100%) rename {Propellor => src/Propellor}/Engine.hs (100%) rename {Propellor => src/Propellor}/Exception.hs (100%) rename {Propellor => src/Propellor}/Message.hs (100%) rename {Propellor => src/Propellor}/PrivData.hs (100%) rename {Propellor => src/Propellor}/Property.hs (100%) rename {Propellor => src/Propellor}/Property/Apache.hs (100%) rename {Propellor => src/Propellor}/Property/Apt.hs (100%) rename {Propellor => src/Propellor}/Property/Cmd.hs (100%) rename {Propellor => src/Propellor}/Property/Cron.hs (100%) rename {Propellor => src/Propellor}/Property/Dns.hs (100%) rename {Propellor => src/Propellor}/Property/Docker.hs (100%) rename {Propellor => src/Propellor}/Property/Docker/Shim.hs (100%) rename {Propellor => src/Propellor}/Property/File.hs (100%) rename {Propellor => src/Propellor}/Property/Git.hs (100%) rename {Propellor => src/Propellor}/Property/Gpg.hs (100%) rename {Propellor => src/Propellor}/Property/Hostname.hs (100%) rename {Propellor => src/Propellor}/Property/Network.hs (100%) rename {Propellor => src/Propellor}/Property/Obnam.hs (100%) rename {Propellor => src/Propellor}/Property/OpenId.hs (100%) rename {Propellor => src/Propellor}/Property/Postfix.hs (100%) rename {Propellor => src/Propellor}/Property/Reboot.hs (100%) rename {Propellor => src/Propellor}/Property/Scheduled.hs (100%) rename {Propellor => src/Propellor}/Property/Service.hs (100%) rename {Propellor => src/Propellor}/Property/SiteSpecific/GitAnnexBuilder.hs (100%) rename {Propellor => src/Propellor}/Property/SiteSpecific/GitHome.hs (100%) rename {Propellor => src/Propellor}/Property/SiteSpecific/JoeySites.hs (100%) rename {Propellor => src/Propellor}/Property/Ssh.hs (100%) rename {Propellor => src/Propellor}/Property/Sudo.hs (100%) rename {Propellor => src/Propellor}/Property/Tor.hs (100%) rename {Propellor => src/Propellor}/Property/User.hs (100%) rename {Propellor => src/Propellor}/SimpleSh.hs (100%) rename {Propellor => src/Propellor}/Types.hs (100%) rename {Propellor => src/Propellor}/Types/Attr.hs (100%) rename {Propellor => src/Propellor}/Types/Dns.hs (100%) rename {Propellor => src/Propellor}/Types/OS.hs (100%) rename {Utility => src/Utility}/Applicative.hs (100%) rename {Utility => src/Utility}/Data.hs (100%) rename {Utility => src/Utility}/Directory.hs (100%) rename {Utility => src/Utility}/Env.hs (100%) rename {Utility => src/Utility}/Exception.hs (100%) rename {Utility => src/Utility}/FileMode.hs (100%) rename {Utility => src/Utility}/FileSystemEncoding.hs (100%) rename {Utility => src/Utility}/LinuxMkLibs.hs (100%) rename {Utility => src/Utility}/Misc.hs (100%) rename {Utility => src/Utility}/Monad.hs (100%) rename {Utility => src/Utility}/PartialPrelude.hs (100%) rename {Utility => src/Utility}/Path.hs (100%) rename {Utility => src/Utility}/PosixFiles.hs (100%) rename {Utility => src/Utility}/Process.hs (100%) rename {Utility => src/Utility}/QuickCheck.hs (100%) rename {Utility => src/Utility}/SafeCommand.hs (100%) rename {Utility => src/Utility}/Scheduled.hs (100%) rename {Utility => src/Utility}/ThreadScheduler.hs (100%) rename {Utility => src/Utility}/Tmp.hs (100%) rename {Utility => src/Utility}/UserInfo.hs (100%) create mode 120000 src/config.hs rename wrapper.hs => src/wrapper.hs (100%) diff --git a/propellor.cabal b/propellor.cabal index 507a0d4..55b7eb6 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -33,9 +33,10 @@ Description: . It is configured using haskell. -Executable propellor +Executable wrapper Main-Is: wrapper.hs GHC-Options: -Wall -threaded + Hs-Source-Dirs: src Build-Depends: MissingH, directory, filepath, base >= 4.5, base < 5, IfElse, process, bytestring, hslogger, unix-compat, ansi-terminal, containers, network, async, time, QuickCheck, mtl, @@ -47,6 +48,7 @@ Executable propellor Executable config Main-Is: config.hs GHC-Options: -Wall -threaded + Hs-Source-Dirs: src Build-Depends: MissingH, directory, filepath, base >= 4.5, base < 5, IfElse, process, bytestring, hslogger, unix-compat, ansi-terminal, containers, network, async, time, QuickCheck, mtl, @@ -57,6 +59,7 @@ Executable config Library GHC-Options: -Wall + Hs-Source-Dirs: src Build-Depends: MissingH, directory, filepath, base >= 4.5, base < 5, IfElse, process, bytestring, hslogger, unix-compat, ansi-terminal, containers, network, async, time, QuickCheck, mtl, diff --git a/Propellor.hs b/src/Propellor.hs similarity index 100% rename from Propellor.hs rename to src/Propellor.hs diff --git a/Propellor/Attr.hs b/src/Propellor/Attr.hs similarity index 100% rename from Propellor/Attr.hs rename to src/Propellor/Attr.hs diff --git a/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs similarity index 100% rename from Propellor/CmdLine.hs rename to src/Propellor/CmdLine.hs diff --git a/Propellor/Engine.hs b/src/Propellor/Engine.hs similarity index 100% rename from Propellor/Engine.hs rename to src/Propellor/Engine.hs diff --git a/Propellor/Exception.hs b/src/Propellor/Exception.hs similarity index 100% rename from Propellor/Exception.hs rename to src/Propellor/Exception.hs diff --git a/Propellor/Message.hs b/src/Propellor/Message.hs similarity index 100% rename from Propellor/Message.hs rename to src/Propellor/Message.hs diff --git a/Propellor/PrivData.hs b/src/Propellor/PrivData.hs similarity index 100% rename from Propellor/PrivData.hs rename to src/Propellor/PrivData.hs diff --git a/Propellor/Property.hs b/src/Propellor/Property.hs similarity index 100% rename from Propellor/Property.hs rename to src/Propellor/Property.hs diff --git a/Propellor/Property/Apache.hs b/src/Propellor/Property/Apache.hs similarity index 100% rename from Propellor/Property/Apache.hs rename to src/Propellor/Property/Apache.hs diff --git a/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs similarity index 100% rename from Propellor/Property/Apt.hs rename to src/Propellor/Property/Apt.hs diff --git a/Propellor/Property/Cmd.hs b/src/Propellor/Property/Cmd.hs similarity index 100% rename from Propellor/Property/Cmd.hs rename to src/Propellor/Property/Cmd.hs diff --git a/Propellor/Property/Cron.hs b/src/Propellor/Property/Cron.hs similarity index 100% rename from Propellor/Property/Cron.hs rename to src/Propellor/Property/Cron.hs diff --git a/Propellor/Property/Dns.hs b/src/Propellor/Property/Dns.hs similarity index 100% rename from Propellor/Property/Dns.hs rename to src/Propellor/Property/Dns.hs diff --git a/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs similarity index 100% rename from Propellor/Property/Docker.hs rename to src/Propellor/Property/Docker.hs diff --git a/Propellor/Property/Docker/Shim.hs b/src/Propellor/Property/Docker/Shim.hs similarity index 100% rename from Propellor/Property/Docker/Shim.hs rename to src/Propellor/Property/Docker/Shim.hs diff --git a/Propellor/Property/File.hs b/src/Propellor/Property/File.hs similarity index 100% rename from Propellor/Property/File.hs rename to src/Propellor/Property/File.hs diff --git a/Propellor/Property/Git.hs b/src/Propellor/Property/Git.hs similarity index 100% rename from Propellor/Property/Git.hs rename to src/Propellor/Property/Git.hs diff --git a/Propellor/Property/Gpg.hs b/src/Propellor/Property/Gpg.hs similarity index 100% rename from Propellor/Property/Gpg.hs rename to src/Propellor/Property/Gpg.hs diff --git a/Propellor/Property/Hostname.hs b/src/Propellor/Property/Hostname.hs similarity index 100% rename from Propellor/Property/Hostname.hs rename to src/Propellor/Property/Hostname.hs diff --git a/Propellor/Property/Network.hs b/src/Propellor/Property/Network.hs similarity index 100% rename from Propellor/Property/Network.hs rename to src/Propellor/Property/Network.hs diff --git a/Propellor/Property/Obnam.hs b/src/Propellor/Property/Obnam.hs similarity index 100% rename from Propellor/Property/Obnam.hs rename to src/Propellor/Property/Obnam.hs diff --git a/Propellor/Property/OpenId.hs b/src/Propellor/Property/OpenId.hs similarity index 100% rename from Propellor/Property/OpenId.hs rename to src/Propellor/Property/OpenId.hs diff --git a/Propellor/Property/Postfix.hs b/src/Propellor/Property/Postfix.hs similarity index 100% rename from Propellor/Property/Postfix.hs rename to src/Propellor/Property/Postfix.hs diff --git a/Propellor/Property/Reboot.hs b/src/Propellor/Property/Reboot.hs similarity index 100% rename from Propellor/Property/Reboot.hs rename to src/Propellor/Property/Reboot.hs diff --git a/Propellor/Property/Scheduled.hs b/src/Propellor/Property/Scheduled.hs similarity index 100% rename from Propellor/Property/Scheduled.hs rename to src/Propellor/Property/Scheduled.hs diff --git a/Propellor/Property/Service.hs b/src/Propellor/Property/Service.hs similarity index 100% rename from Propellor/Property/Service.hs rename to src/Propellor/Property/Service.hs diff --git a/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs similarity index 100% rename from Propellor/Property/SiteSpecific/GitAnnexBuilder.hs rename to src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs diff --git a/Propellor/Property/SiteSpecific/GitHome.hs b/src/Propellor/Property/SiteSpecific/GitHome.hs similarity index 100% rename from Propellor/Property/SiteSpecific/GitHome.hs rename to src/Propellor/Property/SiteSpecific/GitHome.hs diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs similarity index 100% rename from Propellor/Property/SiteSpecific/JoeySites.hs rename to src/Propellor/Property/SiteSpecific/JoeySites.hs diff --git a/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs similarity index 100% rename from Propellor/Property/Ssh.hs rename to src/Propellor/Property/Ssh.hs diff --git a/Propellor/Property/Sudo.hs b/src/Propellor/Property/Sudo.hs similarity index 100% rename from Propellor/Property/Sudo.hs rename to src/Propellor/Property/Sudo.hs diff --git a/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs similarity index 100% rename from Propellor/Property/Tor.hs rename to src/Propellor/Property/Tor.hs diff --git a/Propellor/Property/User.hs b/src/Propellor/Property/User.hs similarity index 100% rename from Propellor/Property/User.hs rename to src/Propellor/Property/User.hs diff --git a/Propellor/SimpleSh.hs b/src/Propellor/SimpleSh.hs similarity index 100% rename from Propellor/SimpleSh.hs rename to src/Propellor/SimpleSh.hs diff --git a/Propellor/Types.hs b/src/Propellor/Types.hs similarity index 100% rename from Propellor/Types.hs rename to src/Propellor/Types.hs diff --git a/Propellor/Types/Attr.hs b/src/Propellor/Types/Attr.hs similarity index 100% rename from Propellor/Types/Attr.hs rename to src/Propellor/Types/Attr.hs diff --git a/Propellor/Types/Dns.hs b/src/Propellor/Types/Dns.hs similarity index 100% rename from Propellor/Types/Dns.hs rename to src/Propellor/Types/Dns.hs diff --git a/Propellor/Types/OS.hs b/src/Propellor/Types/OS.hs similarity index 100% rename from Propellor/Types/OS.hs rename to src/Propellor/Types/OS.hs diff --git a/Utility/Applicative.hs b/src/Utility/Applicative.hs similarity index 100% rename from Utility/Applicative.hs rename to src/Utility/Applicative.hs diff --git a/Utility/Data.hs b/src/Utility/Data.hs similarity index 100% rename from Utility/Data.hs rename to src/Utility/Data.hs diff --git a/Utility/Directory.hs b/src/Utility/Directory.hs similarity index 100% rename from Utility/Directory.hs rename to src/Utility/Directory.hs diff --git a/Utility/Env.hs b/src/Utility/Env.hs similarity index 100% rename from Utility/Env.hs rename to src/Utility/Env.hs diff --git a/Utility/Exception.hs b/src/Utility/Exception.hs similarity index 100% rename from Utility/Exception.hs rename to src/Utility/Exception.hs diff --git a/Utility/FileMode.hs b/src/Utility/FileMode.hs similarity index 100% rename from Utility/FileMode.hs rename to src/Utility/FileMode.hs diff --git a/Utility/FileSystemEncoding.hs b/src/Utility/FileSystemEncoding.hs similarity index 100% rename from Utility/FileSystemEncoding.hs rename to src/Utility/FileSystemEncoding.hs diff --git a/Utility/LinuxMkLibs.hs b/src/Utility/LinuxMkLibs.hs similarity index 100% rename from Utility/LinuxMkLibs.hs rename to src/Utility/LinuxMkLibs.hs diff --git a/Utility/Misc.hs b/src/Utility/Misc.hs similarity index 100% rename from Utility/Misc.hs rename to src/Utility/Misc.hs diff --git a/Utility/Monad.hs b/src/Utility/Monad.hs similarity index 100% rename from Utility/Monad.hs rename to src/Utility/Monad.hs diff --git a/Utility/PartialPrelude.hs b/src/Utility/PartialPrelude.hs similarity index 100% rename from Utility/PartialPrelude.hs rename to src/Utility/PartialPrelude.hs diff --git a/Utility/Path.hs b/src/Utility/Path.hs similarity index 100% rename from Utility/Path.hs rename to src/Utility/Path.hs diff --git a/Utility/PosixFiles.hs b/src/Utility/PosixFiles.hs similarity index 100% rename from Utility/PosixFiles.hs rename to src/Utility/PosixFiles.hs diff --git a/Utility/Process.hs b/src/Utility/Process.hs similarity index 100% rename from Utility/Process.hs rename to src/Utility/Process.hs diff --git a/Utility/QuickCheck.hs b/src/Utility/QuickCheck.hs similarity index 100% rename from Utility/QuickCheck.hs rename to src/Utility/QuickCheck.hs diff --git a/Utility/SafeCommand.hs b/src/Utility/SafeCommand.hs similarity index 100% rename from Utility/SafeCommand.hs rename to src/Utility/SafeCommand.hs diff --git a/Utility/Scheduled.hs b/src/Utility/Scheduled.hs similarity index 100% rename from Utility/Scheduled.hs rename to src/Utility/Scheduled.hs diff --git a/Utility/ThreadScheduler.hs b/src/Utility/ThreadScheduler.hs similarity index 100% rename from Utility/ThreadScheduler.hs rename to src/Utility/ThreadScheduler.hs diff --git a/Utility/Tmp.hs b/src/Utility/Tmp.hs similarity index 100% rename from Utility/Tmp.hs rename to src/Utility/Tmp.hs diff --git a/Utility/UserInfo.hs b/src/Utility/UserInfo.hs similarity index 100% rename from Utility/UserInfo.hs rename to src/Utility/UserInfo.hs diff --git a/src/config.hs b/src/config.hs new file mode 120000 index 0000000..e3af968 --- /dev/null +++ b/src/config.hs @@ -0,0 +1 @@ +../config.hs \ No newline at end of file diff --git a/wrapper.hs b/src/wrapper.hs similarity index 100% rename from wrapper.hs rename to src/wrapper.hs