diff options
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 1 | ||||
| -rw-r--r-- | Types/StandardGroups.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/preferred_content.mdwn | 8 |
4 files changed, 16 insertions, 0 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index caef570c4..f1ea24742 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -22,6 +22,7 @@ import Assistant.WebApp.Configurators.Local import Assistant.WebApp.Configurators.Ssh import Assistant.WebApp.Configurators.Pairing import Assistant.WebApp.Configurators.AWS +import Assistant.WebApp.Configurators.IA import Assistant.WebApp.Configurators.WebDAV import Assistant.WebApp.Configurators.XMPP import Assistant.WebApp.Configurators.Preferences diff --git a/Types/StandardGroups.hs b/Types/StandardGroups.hs index 417d6bec1..055dffe6e 100644 --- a/Types/StandardGroups.hs +++ b/Types/StandardGroups.hs @@ -16,6 +16,7 @@ data StandardGroup | FullArchiveGroup | SourceGroup | ManualGroup + | PublicGroup | UnwantedGroup deriving (Eq, Ord, Enum, Bounded, Show) @@ -28,6 +29,7 @@ fromStandardGroup SmallArchiveGroup = "smallarchive" fromStandardGroup FullArchiveGroup = "archive" fromStandardGroup SourceGroup = "source" fromStandardGroup ManualGroup = "manual" +fromStandardGroup PublicGroup = "public" fromStandardGroup UnwantedGroup = "unwanted" toStandardGroup :: String -> Maybe StandardGroup @@ -39,6 +41,7 @@ toStandardGroup "smallarchive" = Just SmallArchiveGroup toStandardGroup "archive" = Just FullArchiveGroup toStandardGroup "source" = Just SourceGroup toStandardGroup "manual" = Just ManualGroup +toStandardGroup "public" = Just PublicGroup toStandardGroup "unwanted" = Just UnwantedGroup toStandardGroup _ = Nothing @@ -51,6 +54,7 @@ descStandardGroup SmallArchiveGroup = "small archive: archives files located in descStandardGroup FullArchiveGroup = "full archive: archives all files not archived elsewhere" descStandardGroup SourceGroup = "file source: moves files on to other repositories" descStandardGroup ManualGroup = "manual mode: only stores files you manually choose" +descStandardGroup PublicGroup = "public: only stores files located in \"public\" directories" descStandardGroup UnwantedGroup = "unwanted: remove content from this repository" {- See doc/preferred_content.mdwn for explanations of these expressions. -} @@ -67,6 +71,7 @@ preferredContent SmallArchiveGroup = lastResort $ preferredContent FullArchiveGroup = lastResort notArchived preferredContent SourceGroup = "not (copies=1)" preferredContent ManualGroup = "present and (" ++ preferredContent ClientGroup ++ ")" +preferredContent PublicGroup = "include=*/public/* or include=public/*" preferredContent UnwantedGroup = "exclude=*" notArchived :: String diff --git a/debian/changelog b/debian/changelog index 1e6411e5b..8e8bd99fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ git-annex (4.20130418) UNRELEASED; urgency=low * assistant: Sanitize XMPP presence information logged for debugging. * initremote: If two existing remotes have the same name, prefer the one with a higher trust level. + * Add public repository group. + * webapp: Can now set up Internet Archive repositories. -- Joey Hess <joeyh@debian.org> Thu, 18 Apr 2013 16:22:48 -0400 diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn index 1bcdfdf07..ca2d4d207 100644 --- a/doc/preferred_content.mdwn +++ b/doc/preferred_content.mdwn @@ -166,6 +166,14 @@ reached an archive repository. `present and ($client)` +### public + +This is used for publishing information to a repository that can be +publically accessed. Only files inside `public` directories will be +stored in a public repository. + +`include=*/public/* or include=public/*` + ### unwanted Use for repositories that you don't want to exist. This will result |