Commit Graph

42 Commits

Author SHA1 Message Date
Aaron Boodman 5de3951ccf Enable Flickr importer in the production server. This was meant to work previously but there was a bug.
Change-Id: I657a20bd97a9e186d6b2bb4ec34553889e7c262c
2013-12-28 16:10:58 -08:00
mpl 270a7f5e16 serverconfig: use a kv file for thumbnails cache in prod too
Change was done for dev in 5c5666d037

Change-Id: Id8788262f09e5652aa869df6ab2f4718bb3d34f5
2013-12-19 17:33:54 +01:00
Brad Fitzpatrick 5c5666d037 Thumbnail cleanups and let the meta map persist on disk with a sorted.KeyValue
Previously, every time you restarted the server, it forgot about all
thumbnails previously generated.  (in practice it didn't/doesn't
matter with a single user, though, since they're still cached in the
browser and we always reply to If-Modified-Since immediately without
checking the cache)  But it'll matter more with the Publish handler.

Also, rename some stuff, clean up some stuff, drop an unused interface.

And then necessarily change the serverconfig low-level generator to use
a kvfile for the thumbmeta map when using local disk for blobs.

--

Change-Id: I4dcfcb21429a440aa118794c03f7abf7bd69c33b
2013-12-14 09:37:56 -08:00
Brad Fitzpatrick bf54591e8d Remove the memIndex option from genconfig and devcam; default memoryIndex to on.
We had the legacy "memIndex" option to put the Camlistore index in
memory (the leveldb memdb) as an option in genconfig called
"memIndex", and we also had an option called "memoryIndex" for whether
to slurp the on-disk index to memory on start-up.  Too confusing!

Instead, delete "memIndex" (since it's not the default anyway, now
that we have kv).

Then, also (the original point of this change): default the
memoryIndex option to true, so search works for people by default.
This option might go away in the future if it becomes the only required
way.

Also, document this.

Change-Id: Iddffa6e19adbf09c5aacd063aa44de362d90633b
2013-12-11 12:20:22 +04:00
Brad Fitzpatrick 1defe7b297 serverconfig: add 'memoryIndex' bool option to high-level config
Change-Id: If5edb272858f186931eeb57579e221bde3efb07c
2013-11-28 11:09:16 -08:00
Bill Thiede 270e8f54b6 genconfig: use same packed-ness for cache as blobs.
Change-Id: I857f7a3071bfd80ed5f4e8cef8ca2307a978655a
2013-11-27 21:26:04 -08:00
Brad Fitzpatrick 20273566bf serverconfig: fix another /path/to/secring canonicalization case
Change-Id: Ia0bdbdf0bdd0279055344d2c14a23eed473d7098
2013-11-25 08:27:11 -08:00
Brad Fitzpatrick 326b24cc7c Merge "Add diskPack as a high level local storage destination" 2013-11-25 16:20:11 +00:00
Tamás Gulácsi 184686e849 Add diskPack as a high level local storage destination
As a diskPack boolean flag in the high-level server config,
reusing the blobPath parameter for destination.

Change-Id: I9ec0583b160f89952cdad851e66c7fabf22b7bb4
2013-11-25 11:23:50 +01:00
Bill Thiede 6b9f81e3f8 serverconfig: fix secring path for update_golden.
Also regenerated the golden config files.

Change-Id: Id87dcad5f85b060eeee477e1fd3c72bff93d3d5e
2013-11-24 20:38:00 -08:00
Brad Fitzpatrick eae8a74fc9 serverconfig/genconfig: add kv queues to all sync handlers.
In the future this might be more configurable (e.g. mysql or sqlite or whatever, or different
paths).  But this works for now.

Change-Id: I85853e6bfdd9063fc2eba5922b138d5552b730a9
2013-11-24 15:12:11 -08:00
Brad Fitzpatrick f4294cecdf Format pkg/serverconfig/testdata golden files consistently. No semantic changes.
Change-Id: I8c190baf6514a2cf0580da45220d411b81445733
2013-11-24 15:08:47 -08:00
mpl 8f5d54361f serverconfig: fix tests because of previous publish config changes
Change-Id: I643b31be80dcc86b4cdb76bc8a9012dcb57e65ee
2013-11-22 18:14:01 +01:00
mpl edd7f68799 serverconfig: add test for mongo indexer, fix dev mongo config
Change-Id: Ifb7f8cef208dc93a4cf350ff197bb2af2c0e0e81
2013-09-09 22:54:32 +02:00
Aaron Boodman 97fab00c71 Fix bug parsing baseURL config
Change-Id: Ia8a5698ae5e0421672bd91f9a1c1497bcd36eb7c
2013-09-08 16:31:43 -07:00
Brad Fitzpatrick f3f48eb70b Support alternate S3 hostnames
Change-Id: I9a27eb5fb9c4e5ef3b516ce9cf5a4b5bb4e1df61
2013-09-01 09:50:35 -07:00
Brad Fitzpatrick 44acc3b2e7 serverconfig: add kvfile support
Change-Id: If8b4d6b74711cfc169e66ab60a568bcb9b67a7d0
2013-08-25 12:25:30 -05:00
mpl 4acc10e6e4 serverconfig: idle synchandler when no localdisk as primary storage
Because no localdisk means either s3 or google is the primary,
and none of them support efficient replication.

1) Added a dummy synchandler constructor for when config has "idle"
2) Set "idle" for synchandler config when no localdisk
3) fixed corresponding tests

Also:
- added error (and test) when no localdisk and both s3 and google
in config
- added s3 + mysql test

http://camlistore.org/issue/201

Change-Id: I861fdca0c203bc0181ab6d548adab501ed98d2f0
2013-08-21 15:17:13 +02:00
Brad Fitzpatrick b0d2a8f0e5 Merge "Adding Google Drive as a storage backend experimentally. No cheap-enough way of enumerating Drive files, needs to be fixed once Drive supports range queries. Allows you to sync to /sto-googledrive/, but not from." 2013-08-17 15:51:51 +00:00
Burcu Dogan 6e6e910af1 Adding Google Drive as a storage backend experimentally. No cheap-enough way
of enumerating Drive files, needs to be fixed once Drive supports
range queries. Allows you to sync to /sto-googledrive/, but not from.

Change-Id: I6ac5ef02c5f51a6abdab5c207a3a5693c6bb8581
2013-08-17 15:30:02 +02:00
Brad Fitzpatrick f3f0030b25 serverconfig: error on bad baseURL values.
Fixes https://code.google.com/p/camlistore/issues/detail?id=195

Change-Id: I74e194a3903cd7ae36319bc98659e436e9b142d4
2013-08-08 17:50:50 -07:00
mpl 759be70c92 share: allow configuration of URL prefix
http://camlistore.org/issue/160

Change-Id: I77998bbde21790f15a5c4b492307434290ef9421
2013-07-17 16:06:15 +02:00
Michael Zuffoletti c2669a6dfc issue 23: Fix google storage blobserver as sync dest
Change-Id: I33d88dc5028ebb76d4c17d2a00d8f8346114f876
2013-07-08 11:33:10 -05:00
Brad Fitzpatrick ffad34ef94 Add ownerName to config.
Change-Id: I81e39e21f9c76df45fd2bd6f4f6fab02ab28ddbf
2013-06-26 12:55:47 -07:00
mpl c2379dcf07 genconfig: added sourceRoot parameter
Change-Id: I321279c0625ef24d52f62ec718f4a667f735f032
2013-06-20 23:33:00 +02:00
mpl 62cb54b28f serverconfig: fix tests broken by status handler addition
Change-Id: I2dbf2f56e87d2f5043dd6299e151faa71631fb46
2013-06-10 01:21:23 +02:00
mpl 90f8e3686d serverconfig: fix test
reflects newui changes to published gallery

Change-Id: I6f989c205f5e17442615b4b131d4dfb2a96d376d
2013-06-05 15:07:53 +02:00
mpl f21cea5131 share: refactored
-pkg/server/share.go handles share(d) blobs.
-pkg/blobserver/gethandler no longer deals with share blobs
and has been rewritten like the other handlers (no more auth
in there).
-client and signhandler changed accordingly.
-serverconfig: auth moved up in makeCamliHandler
-share parameter added to the user level and low level config.
-share URL is now http(s)://host[:port]/[prefix/]share/sha1-xxxx.

Addresses http://camlistore.org/issue/107

Change-Id: I0a2c07ac1a1e435b141702e0ff06dc8182721d65
2013-03-06 19:11:00 +01:00
Brad Fitzpatrick 6ca0efac8c camlistored: much better sqlite support, by default, and help/docs/hints 2013-01-10 16:16:10 -08:00
Brad Fitzpatrick 642613ebfc serverconfig: sqlite support and general cleanups. 2013-01-10 15:29:08 -08:00
mpl 03ca023b03 serverconfig: make the localdisk optional, so that
s3 can be used as the primary blobserver.

Fixes http://code.google.com/p/camlistore/issues/detail?id=81

Change-Id: I12a7eb9a3dafc885eaaf14ba8da8716a6440416a
2013-01-10 23:14:56 +01:00
Brad Fitzpatrick 5aefa82fab genconfig: s3 config support
Change-Id: I6681d8dffee01ac4a50118377b4172fd2f331049
2012-12-21 16:13:36 -08:00
mpl fd274ecbb1 fix serverconfig tests,
broken because of discovery move from ui to root

Change-Id: I3e2e5c9280f9ea691d9143aa2bc0a971a6dce325
2012-11-12 23:04:55 +01:00
Brad Fitzpatrick 0645035db7 Make serverconfig tests pass again.
Change-Id: I83077f7573a81b643639c78de1a72169e82b09e9
2012-10-20 12:33:39 -07:00
Brad Fitzpatrick 11842fcf33 serverconfig: let baseURL and listen be optionally separate 2012-08-04 21:42:10 +10:00
Brad Fitzpatrick 42833a76e0 serverconfig: be consistent between low- and high-level config
Use TLSCertFile and TLSKeyFile in both.
2012-08-04 21:11:52 +10:00
Brad Fitzpatrick 493f75a72e serverconfig: allow configuring TLS cert/key 2012-08-04 11:12:39 +10:00
mpl da73bef166 support user provided rootNode for published entities
Change-Id: I54810bded2cc03f320e1081945ff5cb2fce0d852
2012-05-02 16:18:05 +02:00
mpl 2a844730b3 support for published entities in genconfig and in wizard
Change-Id: I1768dac9628edb59cf0b987e9054b920d234b36b
2012-04-23 21:00:05 +02:00
Brad Fitzpatrick 6a8a5e197e serverconfig: fix serverconfig tests, which got broken with genconfig changes
Change-Id: I163ea61b568c966439d054962a9dfaa722645606
2012-04-13 15:46:01 -07:00
Brad Fitzpatrick 125c33f019 camlistored: auto-generate a secring/keyId for new users, without gpg
Change-Id: Ib653f9cb5fa0f5e4730854dfaea6c4654f94f377
2012-03-19 21:31:20 -07:00
mpl 7f630657d5 generate low level configuration
Change-Id: I43d1610bdc386954dea724b4b38e184bf16e2d34
2012-03-16 00:05:24 +01:00