From f0c80ee5b82573ef82af21c8d917caa556df8467 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Sun, 18 Apr 2021 03:38:11 +0200 Subject: [PATCH] Domain switchover; accidental apps.json update --- .../abra-apps.json | 290 ++++++++++++------ .../compose.yml | 5 +- .../nginx.conf | 2 +- makefile | 2 +- 4 files changed, 208 insertions(+), 91 deletions(-) rename deploy/{abra-apps.cloud.autonomic.zone => apps.coopcloud.tech}/abra-apps.json (88%) rename deploy/{abra-apps.cloud.autonomic.zone => apps.coopcloud.tech}/compose.yml (69%) rename deploy/{abra-apps.cloud.autonomic.zone => apps.coopcloud.tech}/nginx.conf (77%) diff --git a/deploy/abra-apps.cloud.autonomic.zone/abra-apps.json b/deploy/apps.coopcloud.tech/abra-apps.json similarity index 88% rename from deploy/abra-apps.cloud.autonomic.zone/abra-apps.json rename to deploy/apps.coopcloud.tech/abra-apps.json index 5299ade..4f611c0 100644 --- a/deploy/abra-apps.cloud.autonomic.zone/abra-apps.json +++ b/deploy/apps.coopcloud.tech/abra-apps.json @@ -1,12 +1,13 @@ { "workadventure": { - "category": "apps", + "category": "", "repository": "https://git.autonomic.zone/coop-cloud/workadventure.git", "features": {}, - "versions": {} + "versions": {}, + "icon": "" }, "renovate-bot": { - "category": "apps", + "category": "Development", "repository": "https://git.autonomic.zone/coop-cloud/renovate-bot.git", "features": { "category": "Development", @@ -30,10 +31,11 @@ "digest": "e6698db6" } } - } + }, + "icon": "" }, "drone": { - "category": "apps", + "category": "Development", "repository": "https://git.autonomic.zone/coop-cloud/drone.git", "features": { "category": "Development", @@ -57,10 +59,11 @@ "digest": "9f95ae97" } } - } + }, + "icon": "" }, "kutt": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/kutt.git", "features": { "category": "Apps", @@ -94,10 +97,11 @@ "digest": "56ccea59" } } - } + }, + "icon": "" }, "pelican": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/pelican.git", "features": { "category": "Apps", @@ -126,10 +130,11 @@ "digest": "31ee85db" } } - } + }, + "icon": "" }, "phpservermon": { - "category": "apps", + "category": "Graveyard", "repository": "https://git.autonomic.zone/coop-cloud/phpservermon.git", "features": { "category": "Graveyard", @@ -158,10 +163,11 @@ "digest": "9c681cef" } } - } + }, + "icon": "" }, "osticket": { - "category": "apps", + "category": "App", "repository": "https://git.autonomic.zone/coop-cloud/osticket.git", "features": { "category": "App", @@ -177,10 +183,11 @@ "email": "", "tests": "" }, - "versions": {} + "versions": {}, + "icon": "" }, "adapt_authoring": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/adapt_authoring.git", "features": { "category": "Apps", @@ -221,10 +228,11 @@ "digest": "736eec20" } } - } + }, + "icon": "" }, "selfoss": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/selfoss.git", "features": { "category": "Apps", @@ -253,10 +261,11 @@ "digest": "2f2b1f4d" } } - } + }, + "icon": "" }, "gitea": { - "category": "apps", + "category": "Development", "repository": "https://git.autonomic.zone/coop-cloud/gitea.git", "features": { "category": "Development", @@ -320,11 +329,24 @@ "tag": "10.5", "digest": "9c681cef" } + }, + "1.14.1-rootless": { + "app": { + "image": "gitea/gitea", + "tag": "1.14.1-rootless", + "digest": "6244e9fc" + }, + "db": { + "image": "mariadb", + "tag": "10.5", + "digest": "9c681cef" + } } - } + }, + "icon": "https://git.autonomic.zone/repo-avatars/75-2b3abe26c149aeace0b8834c09345d91" }, "mediawiki": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/mediawiki.git", "features": { "category": "Apps", @@ -362,11 +384,34 @@ "tag": "0.11.0", "digest": "c06d6623" } + }, + "1.35.2": { + "app": { + "image": "mediawiki", + "tag": "1.35.2", + "digest": "aac08598" + }, + "simplesaml": { + "image": "venatorfox/simplesamlphp", + "tag": "latest", + "digest": "9308832b" + }, + "db": { + "image": "mariadb", + "tag": "10.5", + "digest": "9c681cef" + }, + "parsoid": { + "image": "thenets/parsoid", + "tag": "0.11.0", + "digest": "c06d6623" + } } - } + }, + "icon": "" }, "swarmpit": { - "category": "apps", + "category": "Utilities", "repository": "https://git.autonomic.zone/coop-cloud/swarmpit.git", "features": { "category": "Utilities", @@ -405,10 +450,11 @@ "digest": "f92ba65f" } } - } + }, + "icon": "" }, "rocketchat": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/rocketchat.git", "features": { "category": "Apps", @@ -476,10 +522,11 @@ "digest": "007c81ff" } } - } + }, + "icon": "" }, "matrix-synapse": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/matrix-synapse.git", "features": { "category": "Apps", @@ -503,10 +550,11 @@ "digest": "86aaa7dc" } } - } + }, + "icon": "" }, "traefik": { - "category": "apps", + "category": "Utilities", "repository": "https://git.autonomic.zone/coop-cloud/traefik.git", "features": { "category": "Utilities", @@ -530,10 +578,11 @@ "digest": "d7d63b0d" } } - } + }, + "icon": "" }, "strapi": { - "category": "apps", + "category": "Development", "repository": "https://git.autonomic.zone/coop-cloud/strapi.git", "features": { "category": "Development", @@ -562,10 +611,11 @@ "digest": "736eec20" } } - } + }, + "icon": "" }, "statuspal": { - "category": "apps", + "category": "Graveyard", "repository": "https://git.autonomic.zone/coop-cloud/statuspal.git", "features": { "category": "Graveyard", @@ -594,10 +644,11 @@ "digest": "24f2fd74" } } - } + }, + "icon": "" }, "invoiceninja": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/invoiceninja.git", "features": { "category": "Apps", @@ -647,11 +698,29 @@ "tag": "10.5", "digest": "9c681cef" } + }, + "5_1_2": { + "web": { + "image": "nginx", + "tag": "1.19.9", + "digest": "6b5f5eec" + }, + "app": { + "image": "invoiceninja/invoiceninja", + "tag": "5", + "digest": "c400f84f" + }, + "db": { + "image": "mariadb", + "tag": "10.5", + "digest": "9c681cef" + } } - } + }, + "icon": "" }, "statping": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/statping.git", "features": { "category": "Apps", @@ -675,10 +744,11 @@ "digest": "e874da51" } } - } + }, + "icon": "" }, "kimai": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/kimai.git", "features": { "category": "Apps", @@ -707,10 +777,11 @@ "digest": "dce7f54b" } } - } + }, + "icon": "" }, "keycloak": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/keycloak.git", "features": { "category": "Apps", @@ -739,10 +810,11 @@ "digest": "9c681cef" } } - } + }, + "icon": "" }, "h5ai": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/h5ai.git", "features": { "category": "Apps", @@ -758,10 +830,11 @@ "email": "N/A", "tests": "No" }, - "versions": {} + "versions": {}, + "icon": "" }, "wallabag": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/wallabag.git", "features": { "category": "Apps", @@ -795,10 +868,11 @@ "digest": "142f857e" } } - } + }, + "icon": "" }, "radicale": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/radicale.git", "features": { "category": "Apps", @@ -822,10 +896,18 @@ "digest": "0475931d" } } - } + }, + "icon": "" + }, + "penpot": { + "category": "", + "repository": "https://git.autonomic.zone/coop-cloud/penpot.git", + "features": {}, + "versions": {}, + "icon": "" }, "keyoxide": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/keyoxide.git", "features": { "category": "Apps", @@ -856,10 +938,11 @@ "digest": "a8f9b906" } } - } + }, + "icon": "" }, "filerun": { - "category": "apps", + "category": "Graveyard", "repository": "https://git.autonomic.zone/coop-cloud/filerun.git", "features": { "category": "Graveyard", @@ -875,10 +958,11 @@ "email": "No", "tests": "No" }, - "versions": {} + "versions": {}, + "icon": "" }, "projectsend": { - "category": "apps", + "category": "Graveyard", "repository": "https://git.autonomic.zone/coop-cloud/projectsend.git", "features": { "category": "Graveyard", @@ -907,10 +991,11 @@ "digest": "9c681cef" } } - } + }, + "icon": "" }, "znc": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/znc.git", "features": { "category": "Apps", @@ -934,10 +1019,11 @@ "digest": "3c7e3605" } } - } + }, + "icon": "" }, "traefik-forward-auth": { - "category": "apps", + "category": "Utilities", "repository": "https://git.autonomic.zone/coop-cloud/traefik-forward-auth.git", "features": { "category": "Utilities", @@ -961,10 +1047,11 @@ "digest": "e875194d" } } - } + }, + "icon": "" }, "swarm-cronjob": { - "category": "apps", + "category": "Utilities", "repository": "https://git.autonomic.zone/coop-cloud/swarm-cronjob.git", "features": { "category": "Utilities", @@ -988,10 +1075,11 @@ "digest": "b39a76c4" } } - } + }, + "icon": "" }, "civicrm-backdrop": { - "category": "apps", + "category": "", "repository": "https://git.autonomic.zone/coop-cloud/civicrm-backdrop.git", "features": {}, "versions": { @@ -1002,10 +1090,11 @@ "digest": "c628b67d" } } - } + }, + "icon": "" }, "distribution": { - "category": "apps", + "category": "Development", "repository": "https://git.autonomic.zone/coop-cloud/distribution.git", "features": { "category": "Development", @@ -1021,16 +1110,18 @@ "email": "?", "tests": "?" }, - "versions": {} + "versions": {}, + "icon": "" }, "renovate": { - "category": "apps", + "category": "", "repository": "https://git.autonomic.zone/coop-cloud/renovate.git", "features": {}, - "versions": {} + "versions": {}, + "icon": "" }, "drone-docker-runner": { - "category": "apps", + "category": "Development", "repository": "https://git.autonomic.zone/coop-cloud/drone-docker-runner.git", "features": { "category": "Development", @@ -1054,10 +1145,11 @@ "digest": "f4487ae4" } } - } + }, + "icon": "" }, "codimd": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/codimd.git", "features": { "category": "Apps", @@ -1086,10 +1178,11 @@ "digest": "5c163653" } } - } + }, + "icon": "" }, "postfix-relay": { - "category": "apps", + "category": "Utilities", "repository": "https://git.autonomic.zone/coop-cloud/postfix-relay.git", "features": { "category": "Utilities", @@ -1113,10 +1206,11 @@ "digest": "282de498" } } - } + }, + "icon": "" }, "custom-html": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/custom-html.git", "features": { "category": "Apps", @@ -1140,10 +1234,11 @@ "digest": "c628b67d" } } - } + }, + "icon": "" }, "matomo": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/matomo.git", "features": { "category": "Apps", @@ -1172,10 +1267,11 @@ "digest": "dce7f54b" } } - } + }, + "icon": "" }, "wordpress": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/wordpress.git", "features": { "category": "Apps", @@ -1203,11 +1299,24 @@ "tag": "10.5", "digest": "9c681cef" } + }, + "5.7.1": { + "app": { + "image": "wordpress", + "tag": "5.7.1", + "digest": "6ac2321c" + }, + "db": { + "image": "mariadb", + "tag": "10.5", + "digest": "9c681cef" + } } - } + }, + "icon": "" }, "portainer": { - "category": "apps", + "category": "Utilities", "repository": "https://git.autonomic.zone/coop-cloud/portainer.git", "features": { "category": "Utilities", @@ -1236,10 +1345,11 @@ "digest": "397d3dea" } } - } + }, + "icon": "" }, "mailu": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/mailu.git", "features": { "category": "Apps", @@ -1255,10 +1365,11 @@ "email": "N/A", "tests": "No" }, - "versions": {} + "versions": {}, + "icon": "" }, "nextcloud": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/nextcloud.git", "features": { "category": "Apps", @@ -1287,10 +1398,11 @@ "digest": "9c681cef" } } - } + }, + "icon": "" }, "go-neb": { - "category": "apps", + "category": "Utilities", "repository": "https://git.autonomic.zone/coop-cloud/go-neb.git", "features": { "category": "Utilities", @@ -1306,10 +1418,11 @@ "email": "", "tests": "" }, - "versions": {} + "versions": {}, + "icon": "" }, "filestash": { - "category": "apps", + "category": "Apps", "repository": "https://git.autonomic.zone/coop-cloud/filestash.git", "features": { "category": "Apps", @@ -1333,6 +1446,7 @@ "digest": "07d7189c" } } - } + }, + "icon": "" } } diff --git a/deploy/abra-apps.cloud.autonomic.zone/compose.yml b/deploy/apps.coopcloud.tech/compose.yml similarity index 69% rename from deploy/abra-apps.cloud.autonomic.zone/compose.yml rename to deploy/apps.coopcloud.tech/compose.yml index 25b19b6..ae1fb59 100644 --- a/deploy/abra-apps.cloud.autonomic.zone/compose.yml +++ b/deploy/apps.coopcloud.tech/compose.yml @@ -20,9 +20,12 @@ services: labels: - "traefik.enable=true" - "traefik.http.services.abra-apps.loadbalancer.server.port=80" - - "traefik.http.routers.abra-apps.rule=Host(`abra-apps.cloud.autonomic.zone`)" + - "traefik.http.routers.abra-apps.rule=Host(`apps.coopcloud.tech`, `abra-apps.cloud.autonomic.zone`)" - "traefik.http.routers.abra-apps.entrypoints=web-secure" - "traefik.http.routers.abra-apps.tls.certresolver=production" + - "traefik.http.routers.abra-apps.middlewares=abra-apps-redirect" + - "traefik.http.middlewares.abra-apps-redirect.headers.SSLForceHost=true" + - "traefik.http.middlewares.abra-apps-redirect.headers.SSLHost=apps.coopcloud.tech" configs: abra_apps_json: diff --git a/deploy/abra-apps.cloud.autonomic.zone/nginx.conf b/deploy/apps.coopcloud.tech/nginx.conf similarity index 77% rename from deploy/abra-apps.cloud.autonomic.zone/nginx.conf rename to deploy/apps.coopcloud.tech/nginx.conf index 0d99080..091912d 100644 --- a/deploy/abra-apps.cloud.autonomic.zone/nginx.conf +++ b/deploy/apps.coopcloud.tech/nginx.conf @@ -1,6 +1,6 @@ server { listen 80 default_server; - server_name abra-apps.cloud.autonomic.zone; + server_name apps.coopcloud.tech; location / { root /var/www/abra-apps; diff --git a/makefile b/makefile index 41ad7b4..2e5f524 100644 --- a/makefile +++ b/makefile @@ -54,5 +54,5 @@ release-installer: release-abra-apps: @DOCKER_CONTEXT=swarm.autonomic.zone \ docker stack rm abra-apps-json && \ - cd deploy/abra-apps.cloud.autonomic.zone && \ + cd deploy/apps.coopcloud.tech && \ DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-apps-json