~twom/launchpad:apache-config-from-lpconfig

Branch merges

Propose for merging

Merged into launchpad:master

Colin Watson (community): Approve on 2020-02-21

Diff: 24 lines (+3/-3)

1 file modified

Makefile (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

e02c3d2... by Tom Wardill on 2020-02-21

Also use LPCONFIG in copy-certificates rule

a5f8d9a... by Tom Wardill on 2020-02-21

Get the apache config from LPCONFIG

582bf78... by Colin Watson on 2020-02-11

Update version-info.py more carefully

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/378908

57855b5... by Colin Watson on 2020-02-11

Update version-info.py more carefully

"make compile" only ran scripts/update-version-info.sh by way of a make
prerequisite, which often led to version-info.py being incorrect in
development environments. On production, it could be incorrect when
trying to deploy a commit that wasn't the tip of the stable branch: we'd
do a full build, then "git checkout" the desired commit, but then
version-info.py would be left at the wrong commit, possibly causing
failed combo requests for JS and CSS.

Running scripts/update-version-info.sh directly in "make compile" avoids
these problems.

LP: #1862777

19413b7... by Thiago F. Pappacena on 2020-02-10

Renaming (I)ArchiveSigningKey to (I)ArchiveGPGSigningKey

Merged from https://code.launchpad.net/~pappacena/launchpad/+git/launchpad/+merge/378826

3127948... by Thiago F. Pappacena on 2020-01-31

renaming ArchiveSigningKey to ArchiveGPGSiginigKey

2b45e67... by Colin Watson on 2020-02-10

Set pip's cache directory even on the first run

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/378805

2f7f54d... by Colin Watson on 2020-02-10

Set pip's cache directory even on the first run

When I originally converted Launchpad's build system from buildout to
virtualenv and pip, we were still running on precise, and its old
version of pip didn't support the --cache-dir argument. To cope with
this, I did an initial run that only installed an updated pip, and then
used --cache-dir=$(WD)/download-cache/ thereafter.

However, the initial run now installs some more packages, and using
pip's default cache for those can be confusing. While we could split
this up further into three invocations of pip (one to update pip itself,
one to install some further setup requirements, and one to install
everything else), that seems unnecessarily complex now that we no longer
need to support running with precise's version of pip. Instead, just
pass --cache-dir=$(WD)/download-cache/ every time we invoke pip.

28dfc4b... by Tom Wardill on 2020-02-10

Use getopt to add a non-interactive mode to rocketfuel-setup

Merged from https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/377768

65e0bc0... by Tom Wardill on 2020-02-10

Fix indentation