From 1424caffb028c44350c1da69b062a71ccdd48bd6 Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Tue, 18 Feb 2025 06:29:06 -0600 Subject: [PATCH] fix api again --- .github/workflows/generator-linux.yml | 2 +- .github/workflows/generator-macos.yml | 2 +- .github/workflows/generator-windows.yml | 2 +- setup.md | 49 +++++++++++++++++-------- 4 files changed, 36 insertions(+), 19 deletions(-) diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index e7190ee..010744a 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -298,7 +298,7 @@ jobs: sed -i -e '/let Ok(data) = sign::verify(&data, &pk)/,/};/d' ./src/common.rs echo -n "${{ inputs.custom }}" | cat > ./custom.txt sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml - sed -i -e '|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs + sed -i -e 's|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs - name: change url to custom if: fromJson(inputs.extras).urlLink != 'https://rustdesk.com' diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml index 974d2d7..0693121 100644 --- a/.github/workflows/generator-macos.yml +++ b/.github/workflows/generator-macos.yml @@ -239,7 +239,7 @@ jobs: sed -i -e 's|rs-ny.rustdesk.com|${{ inputs.server }}|' ./libs/hbb_common/src/config.rs sed -i -e 's|OeVuKk5nlHiXp+APNn0Y3pC1Iwpwn44JGqrQCsWqmBw=|${{ inputs.key }}|' ./libs/hbb_common/src/config.rs sed -i -e 's|For faster connection, please set up your own server||' ./src/lang/en.rs - sed -i -e '|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs + sed -i -e 's|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs sed -i '' -e '/const KEY:/,/};/d' ./src/common.rs sed -i '' -e '/let Ok(data) = sign::verify(&data, &pk)/,/};/d' ./src/common.rs diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index 6531005..154b682 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -237,7 +237,7 @@ jobs: sed -i -e 's|For faster connection, please set up your own server||' ./src/lang/en.rs sed -i -e '/const KEY:/,/};/d' ./src/common.rs sed -i -e '/let Ok(data) = sign::verify(&data, &pk)/,/};/d' ./src/common.rs - sed -i -e '|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs + sed -i -e 's|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs # ./flutter/pubspec.yaml sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml diff --git a/setup.md b/setup.md index c651b19..781ee18 100644 --- a/setup.md +++ b/setup.md @@ -1,4 +1,35 @@ -## To fully host the client generator yourself, you will need to following: +## Host the rdgen server with docker + +1. First you will need to fork this repo on github +2. Next, setup a A Github fine-grained access token with permissions for your rdgen + repository: + * login to your github account + * click on your profile picture at the top right, click Settings + * at the bottom of the left panel, click Developer Settings + * click Personal access tokens + * click Fine-grained tokens + * click Generate new token + * give a token name, change expiration to whatever you want + * under Repository access, select Only select repositories, then pick your + rdgen repo + * give Read and Write access to actions and workflows + * You might have to go to: https://github.com/USERNAME/rdgen/actions and hit green Enable Actions button so it works. +3. Next, login to your Github account, go to your rdgen repo page (https://github.com/USERNAME/rdgen) + * Click on Settings + * In the left pane, click on Secrets and variables, then click Actions + * Now click New repository secret + * Set the Name to GENURL + * Set the Secret to https://rdgen.hostname.com (or whatever your server will be accessed from) +4. Now download the docker-compose.yml file and fill in the environment variables: + * SECRET_KEY="your secret key" - generate a secret key by running: ```python3 -c 'import secrets; print(secrets.token_hex(100))'``` + * GHUSER="your github username" + * GHBEARER="your fine-grained access token" + * PROTOCOL="https" *optional - defaults to "https", change to "http" if you need to + * REPONAME="rdgen" *optional - defaults to "rdgen", change this if you renamed the repo when you forked it +5. Now just run ```docker compose up -d``` + + +## Host manually: 1. A Github account with a fork of this repo 2. A Github fine-grained access token with permissions for your rdgen @@ -24,20 +55,6 @@ * GENURL="example.com:8000" *this is the domain and port that you are running rdgen on, needs to be accessible on the internet, depending on how you have this setup the port may not be needed - * optional github secrets (for signing the code): - * WINDOWS_PFX_BASE64 - * WINDOWS_PFX_PASSWORD - * WINDOWS_PFX_SHA1_THUMBPRINT - - -## A few notes: - -* If you change your repository name, make sure to change the url on lines - 172-203 of views.py to reflect the change -* If you are running on http instead of https, make sure to make the change on - line 75 of views.py - -## To run rdgen on your server without docker: ``` # Open to the directory you want to install rdgen (change /opt to wherever you want) @@ -69,7 +86,7 @@ open your web browser to yourdomain:8000 use nginx, caddy, traefik, etc. for ssl reverse proxy -## To autostart the server on boot, you can set up a systemd service called rdgen.service +### To autostart the server on boot, you can set up a systemd service called rdgen.service replace user, group, and port if you need to replace /opt with wherever you have installed rdgen save the following file as