From 499cc465838f8d5979b5762e1c914ec64342bd88 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 31 May 2021 21:10:51 +0200 Subject: [PATCH] Migrate `abra` installer to coopcloud.tech domain Closes https://git.autonomic.zone/coop-cloud/abra/issues/150. --- CHANGELOG.md | 1 + README.md | 12 ++++++------ abra | 4 ++-- .../compose.yml | 2 +- .../installer | 0 .../nginx.conf | 2 +- makefile | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) rename deploy/{install.abra.autonomic.zone => install.abra.coopcloud.tech}/compose.yml (94%) rename deploy/{install.abra.autonomic.zone => install.abra.coopcloud.tech}/installer (100%) rename deploy/{install.abra.autonomic.zone => install.abra.coopcloud.tech}/nginx.conf (68%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19dbaea..9292c23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ # abra x.x.x (UNRELEASED) - Only ouput secrets warnings once ([#143](https://git.autonomic.zone/coop-cloud/abra/issues/143)) +- Migrate `abra` installation script to `coopcloud.tech` domain ([#150](https://git.autonomic.zone/coop-cloud/abra/issues/150)) # abra 8.0.0 (2021-05-30) diff --git a/README.md b/README.md index be852b7..182637c 100644 --- a/README.md +++ b/README.md @@ -39,16 +39,16 @@ Requirements: Install the latest stable release: ```sh -curl https://install.abra.autonomic.zone | bash +curl https://install.abra.coopcloud.tech | bash ``` or the bleeding-edge development version: ```sh -curl https://install.abra.autonomic.zone | bash -s -- --dev +curl https://install.abra.coopcloud.tech | bash -s -- --dev ``` -The source for this script is [here](./deploy/install.abra.autonomic.zone/installer). +The source for this script is [here](./deploy/install.abra.coopcloud.tech/installer). ## Update @@ -61,7 +61,7 @@ To update the development version, run `abra upgrade --dev`. It's written in Bash version 4 or greater! -Install it via `curl https://install.abra.autonomic.zone | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`. +Install it via `curl https://install.abra.coopcloud.tech | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`. The command-line interface is generated via [docopt](http://docopt.org/). If you add arguments then you need to run `make docopt` ro regenerate the parser. @@ -82,11 +82,11 @@ Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out ### `abra` -> [install.abra.autonomic.zone](https://install.abra.autonomic.zone) +> [install.abra.coopcloud.tech](https://install.abra.coopcloud.tech) - Change the `x.x.x` header in [CHANGELOG.md](./CHANGELOG.md) to reflect new version and mark date - Update the version in [abra](./abra) -- Update the version in [deploy/install.abra.autonomic.zone/installer](./deploy/install.abra.autonomic.zone/installer) +- Update the version in [deploy/install.abra.coopcloud.tech/installer](./deploy/install.abra.coopcloud.tech/installer) - `git commit` the above changes and then tag it with `git tag ` - `git push` and `git push --tags` - Deploy a new installer script `make release-installer` diff --git a/abra b/abra index 799c9c6..ad5fe13 100755 --- a/abra +++ b/abra @@ -2398,9 +2398,9 @@ OPTIONS sub_upgrade() { if [[ "$abra___dev" == "true" ]]; then - curl https://install.abra.autonomic.zone | bash -s -- --dev + curl https://install.abra.coopcloud.tech | bash -s -- --dev else - curl https://install.abra.autonomic.zone | bash + curl https://install.abra.coopcloud.tech | bash fi } diff --git a/deploy/install.abra.autonomic.zone/compose.yml b/deploy/install.abra.coopcloud.tech/compose.yml similarity index 94% rename from deploy/install.abra.autonomic.zone/compose.yml rename to deploy/install.abra.coopcloud.tech/compose.yml index 0701447..10412ca 100644 --- a/deploy/install.abra.autonomic.zone/compose.yml +++ b/deploy/install.abra.coopcloud.tech/compose.yml @@ -20,7 +20,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.services.abra-installer.loadbalancer.server.port=80" - - "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`)" + - "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`,`install.abra.coopcloud.tech`)" - "traefik.http.routers.abra-installer.entrypoints=web-secure" - "traefik.http.routers.abra-installer.tls.certresolver=production" diff --git a/deploy/install.abra.autonomic.zone/installer b/deploy/install.abra.coopcloud.tech/installer similarity index 100% rename from deploy/install.abra.autonomic.zone/installer rename to deploy/install.abra.coopcloud.tech/installer diff --git a/deploy/install.abra.autonomic.zone/nginx.conf b/deploy/install.abra.coopcloud.tech/nginx.conf similarity index 68% rename from deploy/install.abra.autonomic.zone/nginx.conf rename to deploy/install.abra.coopcloud.tech/nginx.conf index f6d4235..0c15b7c 100644 --- a/deploy/install.abra.autonomic.zone/nginx.conf +++ b/deploy/install.abra.coopcloud.tech/nginx.conf @@ -1,6 +1,6 @@ server { listen 80 default_server; - server_name install.abra.autonomic.zone; + server_name install.abra.autonomic.zone install.abra.coopcloud.tech; location / { root /var/www/abra-installer; diff --git a/makefile b/makefile index 69a7ae6..79d35a2 100644 --- a/makefile +++ b/makefile @@ -48,7 +48,7 @@ codecov: release-installer: @DOCKER_CONTEXT=swarm.autonomic.zone \ docker stack rm abra-installer-script && \ - cd deploy/install.abra.autonomic.zone && \ + cd deploy/install.abra.coopcloud.tech && \ DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script release-apps: