X-Git-Url: https://git.street.me.uk/andy/dehydrated.git/blobdiff_plain/81882a64c2a18df97327980101a547322b70c604..HEAD:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index fa842be..b4e42e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,14 @@
 sudo: false
 language: shell
 
+os:
+  - linux
+  - osx
+
 cache:
   directories:
     - ngrok
 
-before_script:
-  - if [[ ! -e "ngrok/ngrok" ]]; then mkdir -p ngrok; (cd ngrok; wget https://dl.ngrok.com/ngrok_2.0.19_linux_amd64.zip -O ngrok.zip; unzip ngrok.zip ngrok; chmod +x ngrok); fi
-  - ngrok/ngrok http 8080 --log stdout --log-format logfmt --log-level debug > tmp.log &
-  - sleep 5
-  - cat tmp.log
-  - export TMP_URL="$(grep -Eo "Hostname:[a-z0-9]+.ngrok.io" tmp.log | head -1 | cut -d':' -f2)"
-  - (mkdir -p .acme-challenges/.well-known/acme-challenge; cd .acme-challenges; python -m SimpleHTTPServer 8080) &
-  - if [[ -z "${TMP_URL}" ]]; then exit 1; fi
-  - echo 'CA="https://acme-staging.api.letsencrypt.org/directory"' > config.sh
-  - echo 'WELLKNOWN=".acme-challenges/.well-known/acme-challenge"' >> config.sh
-  - echo 'ROOTCERT="lets-encrypt-staging.pem"' >> config.sh
-  - echo "${TMP_URL}" > domains.txt
-
 script:
-  - ./letsencrypt.sh --help
-  - mv config.sh tmp_config.sh
-  - ./letsencrypt.sh --sign "${TMP_URL}" -f tmp_config.sh
-  - mv tmp_config.sh config.sh
-  - ./letsencrypt.sh --cron
-  - ./letsencrypt.sh
-  - openssl x509 -in "certs/${TMP_URL}/cert.pem" -noout -text
-  - openssl verify -verbose -CAfile "certs/lets-encrypt-staging.pem" -purpose sslserver "certs/${TMP_URL}/cert.pem"
-  - rm private_key.pem
-  - ./letsencrypt.sh --revoke "certs/${TMP_URL}/cert.pem" --privkey "certs/${TMP_URL}/privkey.pem"
+  - export CI="true"
+  - ./test.sh