rename module

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

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

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

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

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

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

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

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