diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2021-02-22 02:43:48 +0100 | 
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2021-02-22 03:19:11 +0100 | 
| commit | 9a6a7824a009e1fb1f97afd227181191bc10f0a6 (patch) | |
| tree | e2906add8802b781bcca519b7206a72eecd036f9 /test | |
| parent | f55a2782db2e86c88ed4780d7ed54b09792d07d6 (diff) | |
Fix `./test --deb`.
The staging environment wasn't set properly for the Debian packages.
Diffstat (limited to 'test')
| -rwxr-xr-x | test | 30 | 
1 files changed, 18 insertions, 12 deletions
| @@ -75,21 +75,10 @@ if [ "$MODE" = "deb" ]; then      DISTRIBUTION="$(dpkg-parsechangelog -S Distribution)"      [ "$DISTRIBUTION" != "UNRELEASED" ] || DISTRIBUTION="sid"      PKG_DESTDIR="${XDG_CACHE_HOME:-"$HOME/.cache"}/build-area" -elif [ "$MODE" = "dev" ]; then -    make all -- \ -        BUILDDIR="$BUILDDIR" \ -        DESTDIR="" \ -        exec_prefix="/usr" \ -        datadir="/usr/share" \ -        runstatedir="/run" \ -        lacme_www_user=_lacme-www \ -        lacme_www_group=nogroup \ -        lacme_client_user=_lacme-client \ -        lacme_client_group=nogroup \ -        acmeapi_server="https://acme-staging-v02.api.letsencrypt.org/directory"  fi  ACCOUNT_KEY="$BUILDDIR/account.key" +mkdir -pv -- "$BUILDDIR"  if [ ! -f "$ACCOUNT_KEY" ]; then      # keep the account key (up to `make clean`) to avoid hitting      # rate-liming -- currently 50 registrations per 3h per IP, see @@ -115,6 +104,20 @@ run() {          exit 1      fi +    # Don't need to rebuild for each test, but editing the code at the +    # same time might cause `make install` to rebuild a wrong version +    make all -- \ +        BUILDDIR="$BUILDDIR" \ +        DESTDIR="" \ +        exec_prefix="/usr" \ +        datadir="/usr/share" \ +        runstatedir="/run" \ +        lacme_www_user=_lacme-www \ +        lacme_www_group=nogroup \ +        lacme_client_user=_lacme-client \ +        lacme_client_group=nogroup \ +        acmeapi_server="https://acme-staging-v02.api.letsencrypt.org/directory" +      CHROOT="$(schroot -c "$DISTRIBUTION-$ARCH-sbuild" -b)"      rootdir="/run/schroot/mount/$CHROOT" @@ -163,6 +166,9 @@ run() {      sudo install -oroot -groot -m0644 -vt "$rootdir/usr/share/lacme" certs-staging/*.pem      sudo install -oroot -groot -m0644 -vT "$BUILDDIR/certs-staging/ca-certificates.crt" \          "$rootdir/usr/share/lacme/ca-certificates.crt" +    sudo schroot -d"/" -c "$CHROOT" -r -- \ +        sed -ri '0,/^#?server\s*=.*/ {s||server = https://acme-staging-v02.api.letsencrypt.org/directory|}' \ +            /etc/lacme/lacme.conf      # install account key and configure lacme accordingly      sudo install -oroot -groot -m0600 -vT -- "$BUILDDIR/account.key" \ | 
