From 26d95e86d73f6f7cbbc6644bba52353a084a5975 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Oct 2013 11:33:14 -0400
Subject: [PATCH] rename module

---
 Assistant/WebApp/Configurators/AWS.hs          | 3 +--
 Assistant/WebApp/Configurators/Edit.hs         | 2 +-
 Assistant/WebApp/Configurators/IA.hs           | 2 +-
 Assistant/WebApp/Configurators/Local.hs        | 2 +-
 Assistant/WebApp/Configurators/Ssh.hs          | 3 +--
 Assistant/WebApp/Configurators/WebDAV.hs       | 3 +--
 Assistant/WebApp/Gpg.hs                        | 2 +-
 Assistant/WebApp/{Utility.hs => MakeRemote.hs} | 7 +++++--
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename Assistant/WebApp/{Utility.hs => MakeRemote.hs} (85%)

diff --git a/Assistant/WebApp/Configurators/AWS.hs b/Assistant/WebApp/Configurators/AWS.hs
index 89f7fa2bc3..29f7907768 100644
--- a/Assistant/WebApp/Configurators/AWS.hs
+++ b/Assistant/WebApp/Configurators/AWS.hs
@@ -10,7 +10,7 @@
 module Assistant.WebApp.Configurators.AWS where
 
 import Assistant.WebApp.Common
-import Assistant.MakeRemote
+import Assistant.WebApp.MakeRemote
 #ifdef WITH_S3
 import qualified Remote.S3 as S3
 #endif
@@ -24,7 +24,6 @@ import Types.StandardGroups
 import Creds
 import Assistant.Gpg
 import Git.Remote
-import Assistant.WebApp.Utility
 
 import qualified Data.Text as T
 import qualified Data.Map as M
diff --git a/Assistant/WebApp/Configurators/Edit.hs b/Assistant/WebApp/Configurators/Edit.hs
index f24ebca60e..fc3b8ab0cd 100644
--- a/Assistant/WebApp/Configurators/Edit.hs
+++ b/Assistant/WebApp/Configurators/Edit.hs
@@ -12,7 +12,7 @@ module Assistant.WebApp.Configurators.Edit where
 import Assistant.WebApp.Common
 import Assistant.WebApp.Gpg
 import Assistant.DaemonStatus
-import Assistant.MakeRemote (uniqueRemoteName)
+import Assistant.WebApp.MakeRemote (uniqueRemoteName)
 import Assistant.WebApp.Configurators.XMPP (xmppNeeded)
 import Assistant.ScanRemotes
 import Assistant.Sync
diff --git a/Assistant/WebApp/Configurators/IA.hs b/Assistant/WebApp/Configurators/IA.hs
index 198c4b06a6..de05d6696e 100644
--- a/Assistant/WebApp/Configurators/IA.hs
+++ b/Assistant/WebApp/Configurators/IA.hs
@@ -14,7 +14,7 @@ import qualified Assistant.WebApp.Configurators.AWS as AWS
 #ifdef WITH_S3
 import qualified Remote.S3 as S3
 import qualified Remote.Helper.AWS as AWS
-import Assistant.MakeRemote
+import Assistant.WebApp.MakeRemote
 #endif
 import qualified Remote
 import qualified Types.Remote as Remote
diff --git a/Assistant/WebApp/Configurators/Local.hs b/Assistant/WebApp/Configurators/Local.hs
index 5b495ae677..8528d22a01 100644
--- a/Assistant/WebApp/Configurators/Local.hs
+++ b/Assistant/WebApp/Configurators/Local.hs
@@ -12,7 +12,7 @@ module Assistant.WebApp.Configurators.Local where
 import Assistant.WebApp.Common
 import Assistant.WebApp.OtherRepos
 import Assistant.WebApp.Gpg
-import Assistant.MakeRemote
+import Assistant.WebApp.MakeRemote
 import Assistant.Sync
 import Init
 import qualified Git
diff --git a/Assistant/WebApp/Configurators/Ssh.hs b/Assistant/WebApp/Configurators/Ssh.hs
index 018f45b26d..057472a34b 100644
--- a/Assistant/WebApp/Configurators/Ssh.hs
+++ b/Assistant/WebApp/Configurators/Ssh.hs
@@ -13,7 +13,7 @@ module Assistant.WebApp.Configurators.Ssh where
 import Assistant.WebApp.Common
 import Assistant.WebApp.Gpg
 import Assistant.Ssh
-import Assistant.MakeRemote
+import Assistant.WebApp.MakeRemote
 import Logs.Remote
 import Remote
 import Types.StandardGroups
@@ -21,7 +21,6 @@ import Utility.UserInfo
 import Utility.Gpg
 import Types.Remote (RemoteConfig)
 import Git.Remote
-import Assistant.WebApp.Utility
 import qualified Remote.GCrypt as GCrypt
 import Annex.UUID
 import Logs.UUID
diff --git a/Assistant/WebApp/Configurators/WebDAV.hs b/Assistant/WebApp/Configurators/WebDAV.hs
index 193e3b9d23..c42b8dbbc5 100644
--- a/Assistant/WebApp/Configurators/WebDAV.hs
+++ b/Assistant/WebApp/Configurators/WebDAV.hs
@@ -13,12 +13,11 @@ import Assistant.WebApp.Common
 import Creds
 #ifdef WITH_WEBDAV
 import qualified Remote.WebDAV as WebDAV
-import Assistant.MakeRemote
+import Assistant.WebApp.MakeRemote
 import qualified Remote
 import Types.Remote (RemoteConfig)
 import Types.StandardGroups
 import Logs.Remote
-import Assistant.WebApp.Utility
 import Git.Remote
 
 import qualified Data.Map as M
diff --git a/Assistant/WebApp/Gpg.hs b/Assistant/WebApp/Gpg.hs
index f5b60345af..87fdf5f412 100644
--- a/Assistant/WebApp/Gpg.hs
+++ b/Assistant/WebApp/Gpg.hs
@@ -18,7 +18,7 @@ import qualified Git.Construct
 import qualified Annex.Branch
 import qualified Git.GCrypt
 import qualified Remote.GCrypt as GCrypt
-import Assistant.MakeRemote
+import Assistant.WebApp.MakeRemote
 import Logs.Remote
 
 import qualified Data.Map as M
diff --git a/Assistant/WebApp/Utility.hs b/Assistant/WebApp/MakeRemote.hs
similarity index 85%
rename from Assistant/WebApp/Utility.hs
rename to Assistant/WebApp/MakeRemote.hs
index 3574831ed7..153e4dcef6 100644
--- a/Assistant/WebApp/Utility.hs
+++ b/Assistant/WebApp/MakeRemote.hs
@@ -1,11 +1,14 @@
-{- git-annex assistant webapp utilities
+{- git-annex assistant webapp making remotes
  -
  - Copyright 2012 Joey Hess <joey@kitenet.net>
  -
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
-module Assistant.WebApp.Utility where
+module Assistant.WebApp.MakeRemote (
+	module Assistant.MakeRemote,
+	module Assistant.WebApp.MakeRemote
+) where
 
 import Assistant.Common
 import Assistant.WebApp.Types