From 4d55995eba170da50fe6114463ce73710e1fe951 Mon Sep 17 00:00:00 2001 From: Richard Attermeyer Date: Mon, 27 Nov 2023 20:22:31 +0000 Subject: [PATCH] WIP: updates --- infrastructure/.env | 4 ++-- infrastructure/README.adoc | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/infrastructure/.env b/infrastructure/.env index 094eede..a00ce25 100644 --- a/infrastructure/.env +++ b/infrastructure/.env @@ -25,8 +25,8 @@ WOODPECKER_AGENT_SECRET=CHANGE_ME WOODPECKER_ADMIN=fjadmin WOODPECKER_FORGEJO_URL=${FORGEJO_URL} -WOODPECKER_FORGEJO_CLIENT=7b9c8359-fe2c-4b9a-a33e-c62b35bf879e -WOODPECKER_FORGEJO_SECRET=gto_rfr7enegvbgwsf7fajzqiiq4z6rqsmsufb3v4u2xolswm5ch2m7q +WOODPECKER_FORGEJO_CLIENT=b81129fc-6e15-4142-9492-e6172840f35b +WOODPECKER_FORGEJO_SECRET=gto_xs5t7in6nws3okf75nqfukachuevda7rgw6s6hxlz4vq7pcdndha # Renovate RENOVATE_TOKEN=CHANGE_ME diff --git a/infrastructure/README.adoc b/infrastructure/README.adoc index 5c5df9c..6a7195d 100644 --- a/infrastructure/README.adoc +++ b/infrastructure/README.adoc @@ -9,9 +9,10 @@ Lets say it is `192.168.1.151` then the URLs for accessing the services are: |=== |Service | URL | User / Pwd -| git | https://git.192.168.1.151.nip.io:8543[] | -| woodpecker | https://ci.192.168.1.151.nip.io:8543[] | -| Traefik Dashboard | http://traefik.192.168.1.151.nip.io:8181[] | +| git | https://git.192-168-1-151.nip.io[] | +| woodpecker | https://ci.192-168-1-151.nip.io[] | +| Traefik Dashboard | http://traefik.192-168-1-151.nip.io[] | +| |=== First start forgejo using: @@ -20,11 +21,11 @@ First start forgejo using: And then register an (admin) user in forgejo. -E.g., fjadmin / admin123 / fjadmin@localhost.de +E.g., fjadmin / admin123 / fjadmin@192-168-1-151.nip.io Setup > Applications > oauth2 apps -woodpecker / https://ci.192.168.1.151.nip.io:8543/authorize +woodpecker / https://ci.192-168-1-151.nip.io/authorize note client-id and client-secret and enter this in .env for. @@ -42,7 +43,7 @@ If the IP address of your computer changes, you have to update some configuratio == Check access to woodpecker -Access https://ci.192.168.1.151.nip.io:8543 and try to login. +Access https://ci.192-168-1-151.nip.io and try to login. == Create and push a repository @@ -55,7 +56,7 @@ You need to disable ssl verification for this remote in your local git directory Then add the repository -git remote add origin https://git.192.168.1.151.nip.io:8543/fjadmin/ci-demo-2.git +git remote add origin https://git.192-168-1-151.nip.io:8543/fjadmin/ci-demo-2.git and push it