mirror of https://github.com/perkeep/perkeep.git
Revert "Add genconfig support for flickr importer"
This reverts commit b53e79614d
.
It broke the tests.
This commit is contained in:
parent
1d91f3a627
commit
8367de6e95
|
@ -44,7 +44,6 @@ type configPrefixesParams struct {
|
|||
blobPath string
|
||||
searchOwner blob.Ref
|
||||
shareHandlerPath string
|
||||
flickr map[string]interface{}
|
||||
}
|
||||
|
||||
var (
|
||||
|
@ -445,13 +444,6 @@ func genLowLevelPrefixes(params *configPrefixesParams, ownerName string) (m json
|
|||
}
|
||||
}
|
||||
|
||||
if params.flickr != nil {
|
||||
m["/importer-flickr/"] = map[string]interface{}{
|
||||
"handler": "importer-flickr",
|
||||
"handlerArgs": params.flickr,
|
||||
}
|
||||
}
|
||||
|
||||
if haveIndex {
|
||||
syncArgs := map[string]interface{}{
|
||||
"from": "/bs/",
|
||||
|
@ -538,9 +530,6 @@ func genLowLevelConfig(conf *Config) (lowLevelConf *Config, err error) {
|
|||
sqliteFile = conf.OptionalString("sqlite", "")
|
||||
kvFile = conf.OptionalString("kvIndexFile", "")
|
||||
|
||||
// Importer options
|
||||
flickr = conf.OptionalObject("flickr")
|
||||
|
||||
_ = conf.OptionalList("replicateTo")
|
||||
publish = conf.OptionalObject("publish")
|
||||
// alternative source tree, to override the embedded ui and/or closure resources.
|
||||
|
@ -649,7 +638,6 @@ func genLowLevelConfig(conf *Config) (lowLevelConf *Config, err error) {
|
|||
blobPath: blobPath,
|
||||
searchOwner: blob.SHA1FromString(armoredPublicKey),
|
||||
shareHandlerPath: shareHandlerPath,
|
||||
flickr: flickr,
|
||||
}
|
||||
|
||||
prefixes := genLowLevelPrefixes(prefixesParams, ownerName)
|
||||
|
|
|
@ -23,8 +23,6 @@ web browser and restart the server.</p>
|
|||
|
||||
<li><b><code>baseURL</code></b>: Optional. If non-empty, this is the root of your URL prefix for your Camlistore server. Useful for when running behind a reverse proxy. Should not end in a slash. e.g. <code>https://yourserver.example.com</code></li>
|
||||
|
||||
<li><b><code>flickr</code></b>: Optional, and doesn't do anything yet. Support for continuous import from Flickr. Enter two child keys: <code>appKey</code> and <code>appSecret</code>, which you can get by filling out <a href="http://www.flickr.com/services/apps/create/noncommercial/">this form</a>.</li>
|
||||
|
||||
<li><b><code>https</code></b>: if "true", HTTPS is used
|
||||
<ul>
|
||||
<li><b><code>HTTPSCertFile</code></b>: if using https</li>
|
||||
|
|
Loading…
Reference in New Issue