From 703ea0c870602754a0808feec4e6370f5de294df Mon Sep 17 00:00:00 2001 From: oliviermgx <73127173+oliviermgx@users.noreply.github.com> Date: Mon, 18 Nov 2024 08:50:59 +0100 Subject: [PATCH 1/2] yml file for caprover one-click-app configuration This file is already load in the caprover repo https://github.com/oliviermgx/one-click-apps/blob/Silex-Platform/public/v4/apps/silex-platform.yml. Not necessary to use it directly. For archive only. --- silex-platform.yml | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 silex-platform.yml diff --git a/silex-platform.yml b/silex-platform.yml new file mode 100644 index 0000000..dce323b --- /dev/null +++ b/silex-platform.yml @@ -0,0 +1,69 @@ +captainVersion: 4 +services: + '$$cap_appname': + image: silexlabs/silex-platform:$$cap_version + environment: + SILEX_URL: https://$$cap_appname.$$cap_root_domain + STORAGE_CONNECTORS: $$cap_storage_connector + HOSTING_CONNECTORS: $$cap_hosting_connector + GITLAB_DOMAIN: https://gitlab.com + GITLAB_CLIENT_ID: $$cap_gitlab_client_id + GITLAB_CLIENT_SECRET: $$cap_gitlab_client_secret + GITLAB2_DOMAIN: $$cap_gitlab2_domain + GITLAB2_CLIENT_ID: $$cap_gitlab2_client_id + GITLAB2_CLIENT_SECRET: $$cap_gitlab2_client_secret + GITLAB_SCOPE: 'api read_user' + GITLAB_TIMEOUT: 5000 + volumes: + # - '$$cap_appname-data:/srv/data' + # - '$$cap_appname-cfg:/srv/cfg' + caproverExtra: + containerHttpPort: '6805' +caproverOneClickApp: + variables: + - id: '$$cap_version' + label: silex-platform Version + defaultValue: 'v1.0.162' + description: Check out their Docker page for the valid tags https://hub.docker.com/r/silexlabs/silex-platform/tags + validRegex: "/^([^\\s^\\/])+$/" + - id: '$$cap_tz' + label: Time Zone + defaultValue: Europe/Paris + description: Get yours from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + validRegex: '/.{1,}/' + - id: '$$cap_storage_connector' + label: STORAGE_CONNECTOR + defaultValue: 'gitlab' + description: Storage connector you want to use should be one or more of following gitlab,ftp,gitlab2 (separated with comma but no space) + validRegex: '/^((gitlab|ftp|gitlab2)\,?)*$/' + - id: '$$cap_hosting_connector' + label: HOSTING_CONNECTOR + defaultValue: 'gitlab,download' + description: Hosting connector you want to use should be one or more of following gitlab,ftp,gitlab2,download (separated with comma but no space) + validRegex: '/^((gitlab|ftp|gitlab2|download)\,?)*$/' + - id: '$$cap_gitlab_client_id' + label: GITLAB_CLIENT_ID + description: Your client-id for your gitlab app + - id: '$$cap_gitlab_client_secret' + label: GITLAB_CLIENT_SECRET + description: Your client-secret for your gitlab app + - id: '$$cap_gitlab2_domain' + label: GITLAB2_DOMAIN + description: Domain for your other gitlab instance (e.g. https://framagit.org) + - id: '$$cap_gitlab2_client_id' + label: GITLAB2_CLIENT_ID + description: Your client-id for your other gitlab instance app + - id: '$$cap_gitlab2_client_secret' + label: GITLAB2_CLIENT_SECRET + description: Your client-secret for your other gitlab instance app + instructions: + start: |- + Silex, is a free and open source website builder in the cloud. Create websites directly in the browser without writing code. And it is suitable for professional designers to produce great websites without constraints. Silex is also known as the HTML5 editor. + More details: https://silex.me/ + end: |- + silex-platform has been successfully deployed! + Your service is available at http://$$cap_appname.$$cap_root_domain + displayName: silex-platform + isOfficial: true + description: Silex is an online tool for visually creating static sites with dynamic data. With the free/libre spirit of internet, together. + documentation: See https://silex.me/resources/ \ No newline at end of file From 93785ffc0a3a48d8a04a6475ba531747f60dec1d Mon Sep 17 00:00:00 2001 From: oliviermgx <73127173+oliviermgx@users.noreply.github.com> Date: Tue, 19 Nov 2024 09:54:38 +0100 Subject: [PATCH 2/2] Update README.md for gitlab and caprover --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index d8dc0bf..7c5710c 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,12 @@ You can set the following environment variables to customize the instance: | `BREVO_API_URL` | The API URL for the Brevo service (onboarding, optional) | string | - | | `BREVO_LIST_ID` | The list ID for the Brevo service (onboarding, optional) | string | - | + +## For Your Gitlab App +- see https://docs.gitlab.com/ee/integration/oauth_provider.html#create-a-user-owned-application +- Your redirect url should be : `https://[yourdomain]/api/connector/login/callback` + + ## Support [Please use the main Silex repository](https://github.com/silexlabs/Silex/) for docs and issues