The changes from 7f59a27060 were lost due
to a careless merging of 1e69b9f784 , so
this CL re-adds them.
Other differences:
-in staging, do not try to send e-mails to the production smtp server
-in staging, use our own, distinct, logging name
-remove commented out code of logging V1 that had been introduced in
1e69b9f784.
I have tested that logging V2 works on GCE for the staging instance.
Change-Id: I4b3afebabc94efb28dc55856ce4fd1945ab53559
The parent's fileInfo (outer block) was replaced with the child's
fileInfo (in the for loop) even when os.Lstat failed, i.e. when the latter
fileInfo was actually nil. The next fi.IsDir() (outer block) call would
then panic.
This change only updates the fileInfo when os.Lstat did not fail (i.e.
when a child was actually found).
Change-Id: Id508981354e661b6e8d6f2a0ef6818fbd6b7393e
In addition to API changes, the V2 logging API uses
google.golang.org/grpc, which does not rely directly on net/http. This
is a problem for us because, among other things, when needed (on
CoreOS), we insert the system Root CAs in the TLSConfig of the
default http client through httputil.InstallCerts, which has no effect
on google.golang.org/grpc calls. Therefore, we switch to
github.com/bradfitz/grpc-go instead, which does rely on net/http.
And since GRPC requires HTTP/2, we also now need to manually configure
the default transport (since we're already modifying it) to be HTTP/2
enabled.
Related dependencies updated/added:
updated:
cloud.google.com/go/logging
a64eb5d53f434cc548fd6b2898b5a3e8a0c31b78
github.com/golang/protobuf
8ee79997227bf9b34611aee7946ae64735e6fd93
added:
github.com/bradfitz/grpc-go
188a132adcfba339f1f2d5da52498451341f9ee8
as a replacement for google.golang.org/grpc
github.com/googleapis/gax-go
da06d194a00e19ce00d9011a13931c3f6f6887c7
google.golang.org/genproto/googleapis/logging
08f135d1a31b6ba454287638a3ce23a55adace6f
google.golang.org/genproto/googleapis/datastore
08f135d1a31b6ba454287638a3ce23a55adace6f
google.golang.org/api/support/bundler
e4c04685e5d7db47ff294aa9e514b3a638c431c9
google.golang.org/genproto/googleapis/rpc/status
08f135d1a31b6ba454287638a3ce23a55adace6f
Fixes#873
Change-Id: I3ba14c94122dd9f1b88ef61c2dc26430690d28a9
Add the -staging flag to camweb so one can deploy on a staging
instance.
The instance name is then "camweb-staging" instead of "camweb", and its
hostname is "staging.camlistore.net", instead of "camlistore.org".
server/camnetdns: automatically and regularly discovers the IP of the
"camweb-staging" instance, so it can keep the record for
"staging.camlistore.net" up to date.
Change-Id: I7d64a774049ac01472666ee7e351fd6fb5e4c287
vendor: add golang.org/x/crypto/acme/{autocert}
at 8e06e8ddd9629eb88639aba897641bff8031f1d3
remove rsc.io/letsencrypt and its deps.
Issue #859
Change-Id: I292543e88476bd4658846496f96a2a07bb25a186
This change follows the changes at
ab06dbd80d
google.golang.org/genproto/googleapis/datastore updated to
44808ed2d86e258615bb701d395cbbfe6686a3e6
As a consequence:
google.golang.org/genproto/protobuf added at
44808ed2d86e258615bb701d395cbbfe6686a3e6
google.golang.org/genproto/googleapis/api/{label, metric, monitoredres,
serviceconfig} added/updated to 44808ed2d86e258615bb701d395cbbfe6686a3e6
github.com/golang/protobuf/ptypes{any, struct, timestamp, wrappers}
added/updated to 1f49d83d9aa00e6ce4fc8258c71cc7786aec968a
Test locally, and in "pseudo-production", i.e. with -cloudlaunch but with
a different projectID (hence with some of the hard-coded stuff changed).
Change-Id: Iad0caa78b19619bf153bf05870e6cb3a2ab669dd
All the camweb features depending on docker had been stuck for a couple
of weeks because one of the docker containers was wedged somehow. I
don't know exactly what was wrong, but I figure it can't hurt to add the
same kind of cleanup that we have for the demo blobserver.
So in this CL, we name each container running a git command, so we can
stop and remove said container the next time we run the same command.
Change-Id: I66592fbbde73ea30e4cee7477ada450e0c6a645e
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
We were reusing markdownRenderer per-launch,
which was leading to auto-generated ids incrementing
on each request. See
https://github.com/russross/blackfriday/pull/129Fixes#814.
Change-Id: Idb97348b076e4514cf22abe462bbdf3f8e7f6f9e
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
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
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
Current version of doc/release/monthly.html generated with
go run ./misc/monthly.go -rev cdadfd650b
Change-Id: Icdebf60cb64dfcc12766976572f3a34eaeb135f3
redirect to cleaner URLs without file extension or directory index
filename (index.html or README.md)
Fixes#732
Change-Id: I6332571b2d8ec1ea48e697d31017eb6a63fe1a12
don't strip the "/doc" prefix, which simplifies some of the file
handling logic. Also add a test case for the /docs/ => /doc/ redirect.
Change-Id: I96c60bc031daaeff7f78ca854b60bdc542913b3d
update additional supporting libraries needed with
219f966a95
github.com/golang/protobuf @ 7cc19b78d562895b13596ddce7aafb59dd789318
google.golang.org/grpc @ b062a3c003c22bfef58fa99d689e6a892b408f9d
google.golang.org/cloud @ 36e3752134d445180a77cd40c922c48850b6fe9c
- same as before, just added missing 'internal' package
Tests:
- go run make.go succeeds
- camweb builds and runs
- go test ./pkg/... has a couple of failures, but nothing that wasn't
already failing before this change
Fixes#743
Change-Id: I0a81f471f79255fcb4e0d615630eecce1c5cd966
GitHub treats the CONTRIBUTING file special, in that it is referenced
any time someone files a new issue or starts to create a pull request.
Also make minor updates to file to use markdown and current hacking
instructions.
Change-Id: I68f0d7a69397851ee6c65671ae692cbfb2b93946
The website has several non-HTML files that mostly serve as examples
(eg: https://camlistore.org/doc/json-signing/example/signing-before.camli).
Today these files are parsed and rendered the same as HTML files, which
is particularly bad for these json-signing examples. Instead, they
should be served raw, without any interpretation.
Change-Id: I09f7de130e55da7b2e585f1a110bbbf391f2279f
This is all so that we can enable auto creating header IDs based on the
text of the header. For example "# Foo" is converted to:
<h1 id="foo">Foo</h1>
I'm not really sure why this isn't a default option, but whatever. It's
also unfortunate that we have to copy all of the flags and extensions
from MarkdownCommon, but at least this will make it easier to add more
options in the future, I gues.
Change-Id: I65800c75560ad3b9a3fd0389b722c07ba11ee098
This helps set up serving /docs/ requests out of different file root.
Additional, this allows the actual files on disk used to satisfy
requests to contain a .md or .html file extension (basically simulating
Apache multiviews). Finally, requests that map to directories can be
satisfied by either a index.html or README.md file.
Ref #720
Change-Id: Id6076c242edd74b99a12699cd58c4567973d0d42
We used to have --depth=1 when cloning camlistore.org on startup, for
efficiency reasons.
But not having all the commits locally caused problems when pushing to
github, because it would see the remote had commits that we didn't.
So we're now doing a full cloning.
It looks like it's now taking ~4s (as opposed to ~2.5s before), and
consuming ~50MB diskspace (as opposed to 35MB before).
Plus a few bugfixes.
Change-Id: If7dbae1d3119d8b3336fb7d735f6bd0ba7606fc6
The import path was added to the go file that included the package
documentation if one existed. Otherwise, I used what seemed to be the
primary file for the package.
Fixes#689
Change-Id: If51be0e86529fd6f179e80af6781e639f8550fd2
Because it can happen that we end up with with an already stopped/killed
demoblob3179, in which case we need to remove it even when killing it is
unsuccessful (because it was already dead).
Change-Id: I289e96284deebeaaa775c23ef6f3fe3bffc3777c
Import go4.org/cloud/cloudlaunch and go4.org/cloud/gceutil, which were
previously in pkg/cloudlaunch, at rev
2c497a8c195996d6c48402c150da4919c1d99f33
Because the version on go4.org was updated to use the latest
google.golang.org/api/* , we also update our
vendor/google.golang.org/api/* to rev
030d584ade5f79aa2ed0ce067e8f7da50c9a10d5
This in turns requires to add vendor/golang.org/x/net/context/ctxhttp
(and update vendor/golang.org/x/net/context/) to rev
4f2fc6c1e69d41baf187332ee08fbd2b296f21ed
Also adding vendor/google.golang.org/api/gensupport for the same reason.
Change-Id: I9d6c3059626f7ecc0fbf2df0415043a464d27caa
I believe the added blank line is needed for markdown to "realize" it's
a comment tag, or whatever. The comment is actually hidden again now.
Change-Id: Ia8f63177e9363db676e970b866fe1ffa6f3cab10
When logging to Google Cloud Logging, make sure the deploy handler logs
are written there too.
We tag them with the from:camli-gce-launcher label.
Change-Id: I4dab010009f98efd2aeba7c57dc4ab3ca6a566b3
This includes all of the top-level files in the docs folder except for
status and terms, which are going to be a little trickier to convert.
This includes no editorial changes. There are a few minor stylistic
changes (like the auth value table in server-config converted into a
list). Text has also been mostly wrapped at 80 columns, which accounts
for a lot of the changes as well.
Change-Id: I3782158f05d2b3c72e6cb44bff92c46ccc231a96
Probably needs some more trimming and reorganizing, but I think it's now
pretty much up to date in terms of contents.
Change-Id: I3d04dc2d01098ae7b19f13627d6a6b47256c75f6
convert a simple file (/docs/todo) to markdown as initial proof of
concept. All other existing files which contain HTML but no markdown
should be passed through blackfriday unmolested.
Change-Id: I6ec79f3bb0998fcb54712b748f94b5ae5bbed1c0
Both individual and corporate CLAs support electronic signatures now, so
it's probably not worth specifically calling that out on either.
Change-Id: I3bc531351d28c97b3a68c37eb46fc1f8b5e749ab
Use the website/launcher-config.json JSON config file to provide
all the deploy handler parameters.
Change-Id: I6156eaa80269ad3e70e9d48d7b8253a9a507036e
It converts a permanode set (with a bunch of camliMember) into a static-set.
Mostly for sharing a snapshot. Will likely evolve over time.
Change-Id: I9906750223a27e9a491c91f1ce2490c15d1d3986
To avoid confusion, the previously named "memoryIndex" configuration
parameter, which actually meant to slurp the index into the memory
corpus, has been renamed to "copyIndexToMemory". "memoryIndex" is now
the parameter to enable a memory-only indexer.
http://camlistore.org/issue/416
Change-Id: I7026e5463fda3a1887a88e0b07d4e3431c60c8b7
mpl