Commit Graph

6120 Commits

Author SHA1 Message Date
Mathieu Lonjaret 8f479fd9eb Merge "config/dev-server-config.json: fix publisher" 2016-07-20 13:23:16 +00:00
mpl 73d4d49d55 pkg/server: instruction for updating on GCE
Fixes #825

Change-Id: I07dd2502816b6351b6ae71be84e98952cda5056c
2016-07-20 02:37:56 +02:00
Mathieu Lonjaret dd230b2cba Merge "app/publisher: file rendering and navigation with jquery" 2016-07-19 21:48:16 +00:00
mpl 5a10947138 config/dev-server-config.json: fix publisher
This change should have been with
65343d114d , to keep up with the app
handler changes.

It is ok to hardcode 3179 as the server's listen port (even if that is
not the actually chosen port), because the app handler will only use the
host part of the listen address.

Change-Id: Ib0a40a0376680d67a0617f184d5986117c704246
2016-07-19 17:58:47 +02:00
mpl f3f8aa6f12 pkg/webserver: force tls MinVersion to TLS1.2
Fixes #822

Change-Id: I26481f9666001ed13f9feb92e841c3b4d755a97d
2016-07-19 17:38:46 +02:00
mpl 153fe65735 app/publisher: file rendering and navigation with jquery
Built with gopherjs.

Change-Id: I4ad487930f376b6ac5e2bd08944e7a3643ea650b
2016-07-19 16:37:35 +02:00
Mathieu Lonjaret ebc1fa12d7 Merge "make.go: generate search types for app/publisher" 2016-07-18 23:01:41 +00:00
mpl f40cfc78bb make.go: generate search types for app/publisher
Using go:generate to call a shell script with some go doc + sed hackery.
we could probably do it better with go/types later if needed.

Change-Id: Ie1cf04d418b8b498f83f7029eb736dbc779feeb5
2016-07-18 17:05:58 +02:00
Mathieu Lonjaret 30f578fa19 Merge "app/publisher: infinite scrolling of set members" 2016-07-15 17:01:17 +00:00
Mathieu Lonjaret 069c313836 Merge "Fix camget/cammount so they accept --help" 2016-07-15 13:14:41 +00:00
Aleksandr Mogylchenko 401c44eddd Fix camget/cammount so they accept --help
Fixes #671

Change-Id: I515f592660772f25993008071c36ed46f8a54920
2016-07-15 14:39:48 +02:00
mpl faac33f409 app/publisher: infinite scrolling of set members
Done with gopherjs and jquery.

Some build tagging added in pkg/schema and pkg/netutil because
gopherjs does not support cgo (so no os/user).

Issue #798

Change-Id: Ib1e1e94185f75cdf696aa2dd31c57fa9e3af84a1
2016-07-15 00:34:52 +02:00
Mathieu Lonjaret bae6855ade Merge "make.go: build and run gopherjs for publisher" 2016-07-13 13:31:34 +00:00
mpl 3b2ec3af0f make.go: build and run gopherjs for publisher
Run gopherjs to generate trivial javascript code that is used by the
publisher app.

Context:
https://github.com/camlistore/camlistore/issues/798#issuecomment-226902924

github.com/gopherjs vendored in at rev
f3c437955da554f2643747a598b0cc772a749f3f

PLEASE NOTE that this copy of gopherjs has been modified to avoid
depending on fsnotify. Hence the -w flag and the gopherjs serve command
are most likely broken.
Diff for that modification:
https://gist.github.com/mpl/ac9033bb28207401b7cedc3d74e6c096

Dependencies for building gopherjs:

kardianos/osext 29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc
neelance/sourcemap 8c68805598ab8d5637b1a72b5f7d381ea0f39c31
spf13/cobra c678ff029ee250b65714e518f4f5c5cb934955de
spf13/pflag 7f60f83a2c81bc3c3c0d5297f61ddfa68da9d3b7
golang.org/x/crypto/ssh/terminal
c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6
golang.org/x/tools/go/types/typeutil
ac02106e04bdb66a2db0413d931012bea165d7e0

github.com/gopherjs/jquery vendored in at
fbbfc4bbe29a29cb05788b66be44e0ac7f43cac7

jquery vendored in at 2.2.3

Change-Id: I7ff2d8e43e8a963f5ac1d13a2c936f263f7c53fc
2016-07-13 00:06:20 +02:00
mpl 9beb003f30 website: feature monthly releases
Fixes #690

Change-Id: I05db5f29656d76237621fc2479d59d71cb917bb0
2016-07-06 16:41:15 +02:00
Mathieu Lonjaret fd91688f5f Merge "pkg/server/app: improve app handling" 2016-07-05 13:54:00 +00:00
mpl 65343d114d pkg/server/app: improve app handling
These improvements on the server app handler should help writing
and running stand-alone apps.

The two main goals are:
1) "simple" configurations should work automatically; the parameters for
the app are derived from the Listen and BaseURL of the Camlistore
server.
2) More advanced configurations, such as being behind a proxy, should be
easily configurable through the app's Listen, BackendURL, and ApiHost
parameters.

I had worked on them while doing the scanning cabinet app, and I am
backporting them now since we haven't landed the scanning cabinet yet,
and people have been having trouble setting up the publisher.

pkg/app/app_test.go is gone because app.ListenAddress is now dumb. The
hard work is done in pkg/server/app instead.

Fixes #818

Change-Id: Ice2610d6bac611b209cc3a928e67fa6093a41d3e
2016-07-04 22:21:16 +02:00
mpl c332b2881d gitignore: bin/website
Because 'go run make.go -website' now installs in bin/website

Change-Id: I4785ebd6711f0fd8297cff36ee1000e214dbdef2
2016-06-29 17:04:54 +02:00
Mathieu Lonjaret b69b4f6d37 Merge "webUI: disable tokenAuth when auth is None" 2016-06-27 23:58:10 +00:00
mpl@serenity 5522ebbeb1 webUI: disable tokenAuth when auth is None
This allows deferring HTTP authentication and authorization to a proxy
(such as nginx) between Camlistore and the rest of the world, without
breaking the web UI.

Fixes #816

Change-Id: Ia4b5be8f2236ddac68dc0d3a09f0f24e588c4995
2016-06-28 01:56:08 +02:00
mpl ce8b329d1d website: update CLA instruction
Change-Id: I399ad44a0ebdeff05efd1dabb3137299b01f112b
2016-06-24 18:12:42 +02:00
Mathieu Lonjaret 77f50b2579 Merge "website: mv downloadBox to all.css" 2016-06-20 15:55:54 +00:00
mpl 1087a9d837 website: mv downloadBox to all.css
Rids us of the IsMonthly hack.

We still need to do something about AddTemplateTheme in handler.go
though, see TODO there. In another change.

Also, change servePage to take a struct for its args, more in line with
Go style of few arguments.

Context: issue #815

Change-Id: Ib6799be31b78af3010eee942034f2ac0e8e1d76e
2016-06-20 17:51:46 +02:00
Mathieu Lonjaret e4e0d17def Merge "misc/docker: add zoneinfo to GCE docker image" 2016-06-20 14:54:23 +00:00
Eric Drechsel 6321f9b951 Instantiate markdownRenderer per-request
We were reusing markdownRenderer per-launch,
which was leading to auto-generated ids incrementing
on each request. See

https://github.com/russross/blackfriday/pull/129

Fixes #814.

Change-Id: Idb97348b076e4514cf22abe462bbdf3f8e7f6f9e
2016-06-19 14:32:07 -07:00
mpl 1587a8a05b pkg/deploy/gce: temp fix to bring /launch back up
I had forgotten that the launcher also uses website/tmpl/page.html when
I introduced the gross IsMonthly hack. Which bites us now that the
launcher is restarted.

I'll rethink the IsMonthly mechanism right after.

Fixes #815

Change-Id: I7d2f7fd553e0ae9ab386266d310ee8175ce2d4ea
2016-06-17 22:22:26 +02:00
Tamás Gulácsi 78f21f5e15 diskpacked: allow removing non-existing blob
Let double-delete test pass.
Make leveldb and memdb Deletes go on for ErrNotFound.

Add test for batch deleting nonexisting key, and partial batch delete
errors - fix it for mongo.

Fixes #760.

Change-Id: I0a0e28836a723d245564f3dabaf328bf73bf463a
2016-06-16 20:26:56 +02:00
Mathieu Lonjaret ae7b4b5d77 Merge "website: use Let's Encrypt" 2016-06-15 14:51:05 +00:00
mpl 1ab6ff4176 website: use Let's Encrypt
rsc.io/letsencrypt vendored at rev
a019c9e6fce0c7132679dea13bd8df7c86ffe26c

vendor/github.com/xenolf/lego was vendored within rsc.io/letsencrypt

vendor/gopkg.in/square/go-jose.v1/ was vendored within
rsc.io/letsencrypt

golang.org/x/crypto at rev 77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e for
github.com/xenolf/lego

golang.org/x/time/rate at rev a4bde12657593d5e90d0533a3e4fd95e635124cb
for rsc.io/letsencrypt

Fixes #805

Change-Id: I4ccdee328d8832e361fa5a39e5b94edc7c90ec34
2016-06-10 17:55:16 +02:00
mpl 46cf811f43 pkg/server: update home page and doc about /setup
wizard under /setup is gone, we should not advertize it anymore.

Change-Id: I7c5384481db9b3f37f1c8b0a6f5a8fe482c4d99b
2016-06-09 17:50:03 +02:00
Mathieu Lonjaret d9de594d7c Merge "Dockerfile: update" 2016-06-09 14:21:45 +00:00
mpl f055f0ed18 Dockerfile: update
Change-Id: Icb5f9d53bb9975921018efe0701018cb49878cd4
2016-06-09 16:20:31 +02:00
Joseph Anthony Pasquale Holsten 118585fef1 pkg/constants/google: remove, use oauth2/google instead
The google Endpoint is now available in upstream oauth2, we no longer
need to define it ourselves.

Fixes #810

Change-Id: I37db869ff7696c53ba456ecba55e72c8c86dd119
2016-06-08 16:15:39 -07:00
mpl b4af9400a2 sorted/sqlkv: rollback failed transaction
Fixes #782

Change-Id: I22e933426b1f95a987699df725d24eb4317040d5
2016-06-06 22:43:47 +02:00
Mathieu Lonjaret 76cf1a0900 Merge "vendor: update go4.org/lock" 2016-06-06 16:21:18 +00:00
mpl b1f49a2548 vendor: update go4.org/lock
rev 15c19124e43b90eba9aa27b4341e38365254a84a

Change-Id: Ibf38bcc38f94df11cfd0f605608ec8f8b6171c70
2016-06-04 01:27:53 +02:00
Will Norris 08887184f8 Merge "Document workflow for editing documentation." 2016-06-03 23:05:10 +00:00
Will Norris b06d28bf0f Merge "Convert code, community, and download pages to md." 2016-06-03 23:03:48 +00:00
Will Norris fe11e18854 Merge "Remove /doc/contributing.md" 2016-06-03 22:54:07 +00:00
Eric Drechsel 71d323bb02 Document workflow for editing documentation.
Change-Id: Ia8e19770a45528ef2fee18cffa007e7fcf96ebe3
2016-06-03 14:43:00 -07:00
Eric Drechsel 7ab869d542 Convert code, community, and download pages to md.
Output differences:

 - Changed the heading "Contributing to Camlistore" to just
   "Contributing", so the heading ID stays the same.
 - Remove "ul.lispaced" class, just put newlines
   between list items instead (visually identical)
 - One instance of obsolete <tt> tag in /code replaced with <code>

Site index page has non-typographic elements, so converting to markdown
seems pointless.

Change-Id: I7b19337742f727f85e58639a1168cc46fd8a4e62
2016-06-03 14:43:00 -07:00
Eric Drechsel 80f011484a Remove /doc/contributing.md
It was just routing links from other pages to

    https://camlistore.org/code#contributing

Let this be handled by a redirect

    /doc/contributing → /doc/code#contributing

instead.

/doc/contributing.md is allowed to 404. It has only been valid since
April and was only linked from release notes, so there are probably no
external links.

Change-Id: I04809760cbdb2cf37e98d36f545d2952f96f3113
2016-06-03 14:42:05 -07:00
Will Norris eeb7970d4b Merge "Comment explaining that contributors.html is a fallback." 2016-06-03 21:39:32 +00:00
Mathieu Lonjaret 4993dc39d2 Merge "importer/pinboard: fix test" 2016-06-03 21:09:06 +00:00
mpl 47d9ea03f7 importer/pinboard: fix test
Change-Id: Ib824e083d91d83256627f027a889c73878cf04dc
2016-06-03 23:08:15 +02:00
Eric Drechsel d9c28e5267 Comment explaining that contributors.html is a fallback.
This file would seem to be the source for /contributors, but actually
it's a fallback for /website/content/tmpl/contrib.html.

Add a comment explaining the automatic generation to avoid confusion
for folks attempting to edit the website.

Also rename the template to contributing.html for consistency.

Change-Id: Ic98c494b0cc24292dac8a4a22c751aded87f5b48
2016-06-03 14:06:30 -07:00
Mathieu Lonjaret ecc3e84352 Merge "serverinit: print stack when recovering in InstallHandlers" 2016-06-03 17:14:20 +00:00
Mathieu Lonjaret a0271c3cc9 Merge "pkg/serverinit: allow sorted for other indexes" 2016-06-02 14:39:24 +00:00
mpl ef7759649b pkg/serverinit: allow sorted for other indexes
The blobpacked storage, among others, needs a sorted storage
implementation for its meta index. This changes lets the high-level
config specify a sorted implementation (that various indexes will use)
even when the (main) indexer is specifically disabled.

Fixes #797

Change-Id: Id69a939318aa6654b9fb92ee34978ae1d1c24291
2016-06-02 16:37:54 +02:00
Mathieu Lonjaret 1ee701c79a Merge "pkg/client: fail properly when no SearchRoot" 2016-06-02 14:09:40 +00:00