From 5d336039ba8635ad917b906345db719fdbc0cd55 Mon Sep 17 00:00:00 2001 From: DCCONSTRUCTIONS Date: Wed, 29 Apr 2026 00:37:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=A0=D0=A5=20-=20=D0=9C=D0=95=D0=96?= =?UTF-8?q?=D0=9F=D0=A0=D0=9E=D0=95=D0=9A=D0=A2=D0=9D=D0=90=D0=AF=20=D0=9A?= =?UTF-8?q?=D0=9E=D0=9C=D0=9C=D0=A3=D0=9D=D0=98=D0=9A=D0=90=D0=A6=D0=98?= =?UTF-8?q?=D0=AF:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B5=D0=B7=D0=B4=20God=20Mo?= =?UTF-8?q?de=20=D0=BD=D0=B0=20nodedcsudo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yaml | 17 +++++++++-------- plane-app/docker-compose.yaml | 17 +++++++++-------- plane-src/CONTRIBUTING.md | 2 +- plane-src/apps/admin/Dockerfile.admin | 6 +++--- plane-src/apps/admin/Dockerfile.dev | 2 +- plane-src/apps/admin/nginx/nginx.conf | 4 ++-- .../apps/api/plane/authentication/utils/host.py | 2 +- plane-src/apps/api/plane/settings/common.py | 2 +- plane-src/apps/api/plane/utils/constants.py | 1 + plane-src/apps/api/plane/utils/host.py | 2 +- plane-src/apps/proxy/Caddyfile.aio.ce | 2 +- plane-src/apps/proxy/Caddyfile.ce | 4 ++-- plane-src/apps/space/Dockerfile.space | 2 +- plane-src/apps/web/Dockerfile.web | 2 +- plane-src/packages/constants/src/workspace.ts | 1 + 15 files changed, 35 insertions(+), 31 deletions(-) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 60517af..94c4a27 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -27,11 +27,11 @@ x-proxy-env: &proxy-env APP_DOMAIN: ${APP_DOMAIN:-localhost} FILE_SIZE_LIMIT: ${PROXY_BODY_SIZE_LIMIT:-1073741824} PROXY_BODY_SIZE_LIMIT: ${PROXY_BODY_SIZE_LIMIT:-1073741824} - CERT_EMAIL: ${CERT_EMAIL} - CERT_ACME_CA: ${CERT_ACME_CA} - CERT_ACME_DNS: ${CERT_ACME_DNS} - LISTEN_HTTP_PORT: ${LISTEN_HTTP_PORT:-80} - LISTEN_HTTPS_PORT: ${LISTEN_HTTPS_PORT:-443} + CERT_EMAIL: ${CERT_EMAIL:-} + CERT_ACME_CA: ${CERT_ACME_CA:-https://acme-v02.api.letsencrypt.org/directory} + CERT_ACME_DNS: ${CERT_ACME_DNS:-} + LISTEN_HTTP_PORT: ${LISTEN_HTTP_PORT:-8090} + LISTEN_HTTPS_PORT: ${LISTEN_HTTPS_PORT:-8443} BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads} SITE_ADDRESS: ${SITE_ADDRESS:-:80} @@ -57,6 +57,7 @@ x-app-env: &app-env INSTANCE_CHANGELOG_URL: ${INSTANCE_CHANGELOG_URL:-} IS_INTERCOM_ENABLED: ${IS_INTERCOM_ENABLED:-0} INTERCOM_APP_ID: ${INTERCOM_APP_ID:-} + ADMIN_BASE_PATH: ${ADMIN_BASE_PATH:-/nodedcsudo/} USE_MINIO: ${USE_MINIO:-1} DATABASE_URL: ${DATABASE_URL:-postgresql://plane:plane@plane-db/plane} SECRET_KEY: ${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5} @@ -222,7 +223,7 @@ services: # Comment this if you already have a reverse proxy running proxy: - image: makeplane/plane-proxy:${APP_RELEASE:-v1.3.0} + image: nodedc/plane-proxy:ru deploy: replicas: 1 restart_policy: @@ -231,11 +232,11 @@ services: <<: *proxy-env ports: - target: 80 - published: ${LISTEN_HTTP_PORT:-80} + published: ${LISTEN_HTTP_PORT:-8090} protocol: tcp mode: host - target: 443 - published: ${LISTEN_HTTPS_PORT:-443} + published: ${LISTEN_HTTPS_PORT:-8443} protocol: tcp mode: host volumes: diff --git a/plane-app/docker-compose.yaml b/plane-app/docker-compose.yaml index 6395033..d78b7eb 100644 --- a/plane-app/docker-compose.yaml +++ b/plane-app/docker-compose.yaml @@ -27,11 +27,11 @@ x-proxy-env: &proxy-env APP_DOMAIN: ${APP_DOMAIN:-localhost} FILE_SIZE_LIMIT: ${PROXY_BODY_SIZE_LIMIT:-1073741824} PROXY_BODY_SIZE_LIMIT: ${PROXY_BODY_SIZE_LIMIT:-1073741824} - CERT_EMAIL: ${CERT_EMAIL} - CERT_ACME_CA: ${CERT_ACME_CA} - CERT_ACME_DNS: ${CERT_ACME_DNS} - LISTEN_HTTP_PORT: ${LISTEN_HTTP_PORT:-80} - LISTEN_HTTPS_PORT: ${LISTEN_HTTPS_PORT:-443} + CERT_EMAIL: ${CERT_EMAIL:-} + CERT_ACME_CA: ${CERT_ACME_CA:-https://acme-v02.api.letsencrypt.org/directory} + CERT_ACME_DNS: ${CERT_ACME_DNS:-} + LISTEN_HTTP_PORT: ${LISTEN_HTTP_PORT:-8090} + LISTEN_HTTPS_PORT: ${LISTEN_HTTPS_PORT:-8443} BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads} SITE_ADDRESS: ${SITE_ADDRESS:-:80} @@ -57,6 +57,7 @@ x-app-env: &app-env INSTANCE_CHANGELOG_URL: ${INSTANCE_CHANGELOG_URL:-} IS_INTERCOM_ENABLED: ${IS_INTERCOM_ENABLED:-0} INTERCOM_APP_ID: ${INTERCOM_APP_ID:-} + ADMIN_BASE_PATH: ${ADMIN_BASE_PATH:-/nodedcsudo/} USE_MINIO: ${USE_MINIO:-1} DATABASE_URL: ${DATABASE_URL:-postgresql://plane:plane@plane-db/plane} SECRET_KEY: ${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5} @@ -222,7 +223,7 @@ services: # Comment this if you already have a reverse proxy running proxy: - image: makeplane/plane-proxy:${APP_RELEASE:-v1.3.0} + image: nodedc/plane-proxy:ru deploy: replicas: 1 restart_policy: @@ -231,11 +232,11 @@ services: <<: *proxy-env ports: - target: 80 - published: ${LISTEN_HTTP_PORT:-80} + published: ${LISTEN_HTTP_PORT:-8090} protocol: tcp mode: host - target: 443 - published: ${LISTEN_HTTPS_PORT:-443} + published: ${LISTEN_HTTPS_PORT:-8443} protocol: tcp mode: host volumes: diff --git a/plane-src/CONTRIBUTING.md b/plane-src/CONTRIBUTING.md index d0f3d75..de7e80b 100644 --- a/plane-src/CONTRIBUTING.md +++ b/plane-src/CONTRIBUTING.md @@ -76,7 +76,7 @@ docker compose -f docker-compose-local.yml up pnpm dev ``` -5. Open your browser to http://localhost:3001/god-mode/ and register yourself as instance admin +5. Open your browser to http://localhost:3001/nodedcsudo/ and register yourself as instance admin 6. Open up your browser to http://localhost:3000 then log in using the same credentials from the previous step That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉 diff --git a/plane-src/apps/admin/Dockerfile.admin b/plane-src/apps/admin/Dockerfile.admin index 19ad2c3..38ecd82 100644 --- a/plane-src/apps/admin/Dockerfile.admin +++ b/plane-src/apps/admin/Dockerfile.admin @@ -35,7 +35,7 @@ ENV VITE_API_BASE_PATH=$VITE_API_BASE_PATH ARG VITE_ADMIN_BASE_URL="" ENV VITE_ADMIN_BASE_URL=$VITE_ADMIN_BASE_URL -ARG VITE_ADMIN_BASE_PATH="/god-mode" +ARG VITE_ADMIN_BASE_PATH="/nodedcsudo" ENV VITE_ADMIN_BASE_PATH=$VITE_ADMIN_BASE_PATH ARG VITE_SPACE_BASE_URL="" @@ -78,11 +78,11 @@ RUN pnpm turbo run build --filter=admin FROM nginx:1.29-alpine AS production COPY apps/admin/nginx/nginx.conf /etc/nginx/nginx.conf -COPY --from=installer /app/apps/admin/build/client /usr/share/nginx/html/god-mode +COPY --from=installer /app/apps/admin/build/client /usr/share/nginx/html/nodedcsudo EXPOSE 3000 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \ CMD curl -fsS http://127.0.0.1:3000/ >/dev/null || exit 1 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +CMD ["nginx", "-g", "daemon off;"] diff --git a/plane-src/apps/admin/Dockerfile.dev b/plane-src/apps/admin/Dockerfile.dev index f5dae8c..edd1d9d 100644 --- a/plane-src/apps/admin/Dockerfile.dev +++ b/plane-src/apps/admin/Dockerfile.dev @@ -8,7 +8,7 @@ COPY . . RUN corepack enable pnpm && pnpm add -g turbo RUN pnpm install -ENV VITE_ADMIN_BASE_PATH="/god-mode" +ENV VITE_ADMIN_BASE_PATH="/nodedcsudo" EXPOSE 3000 diff --git a/plane-src/apps/admin/nginx/nginx.conf b/plane-src/apps/admin/nginx/nginx.conf index 0fd4a19..6781e2b 100644 --- a/plane-src/apps/admin/nginx/nginx.conf +++ b/plane-src/apps/admin/nginx/nginx.conf @@ -29,7 +29,7 @@ http { location / { root /usr/share/nginx/html; index index.html index.htm; - try_files $uri $uri/ /god-mode/index.html; + try_files $uri $uri/ /nodedcsudo/index.html; } } -} \ No newline at end of file +} diff --git a/plane-src/apps/api/plane/authentication/utils/host.py b/plane-src/apps/api/plane/authentication/utils/host.py index d79d54e..9233195 100644 --- a/plane-src/apps/api/plane/authentication/utils/host.py +++ b/plane-src/apps/api/plane/authentication/utils/host.py @@ -27,7 +27,7 @@ def base_host( if is_admin: admin_base_path = getattr(settings, "ADMIN_BASE_PATH", None) if not isinstance(admin_base_path, str): - admin_base_path = "/god-mode/" + admin_base_path = "/nodedcsudo/" if not admin_base_path.startswith("/"): admin_base_path = "/" + admin_base_path if not admin_base_path.endswith("/"): diff --git a/plane-src/apps/api/plane/settings/common.py b/plane-src/apps/api/plane/settings/common.py index 952efe3..22fcc98 100644 --- a/plane-src/apps/api/plane/settings/common.py +++ b/plane-src/apps/api/plane/settings/common.py @@ -351,7 +351,7 @@ CSRF_FAILURE_VIEW = "plane.authentication.views.common.csrf_failure" ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None) if ADMIN_BASE_URL and not is_valid_url(ADMIN_BASE_URL): ADMIN_BASE_URL = None -ADMIN_BASE_PATH = os.environ.get("ADMIN_BASE_PATH", "/god-mode/") +ADMIN_BASE_PATH = os.environ.get("ADMIN_BASE_PATH", "/nodedcsudo/") # Space Base URL SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None) diff --git a/plane-src/apps/api/plane/utils/constants.py b/plane-src/apps/api/plane/utils/constants.py index 1ccc501..64aad2c 100644 --- a/plane-src/apps/api/plane/utils/constants.py +++ b/plane-src/apps/api/plane/utils/constants.py @@ -8,6 +8,7 @@ RESTRICTED_WORKSPACE_SLUGS = [ "api", "create-workspace", "god-mode", + "nodedcsudo", "installations", "invitations", "onboarding", diff --git a/plane-src/apps/api/plane/utils/host.py b/plane-src/apps/api/plane/utils/host.py index dafd191..a8b750b 100644 --- a/plane-src/apps/api/plane/utils/host.py +++ b/plane-src/apps/api/plane/utils/host.py @@ -31,7 +31,7 @@ def base_host( if is_admin: admin_base_path = getattr(settings, "ADMIN_BASE_PATH", None) if not isinstance(admin_base_path, str): - admin_base_path = "/god-mode/" + admin_base_path = "/nodedcsudo/" if not admin_base_path.startswith("/"): admin_base_path = "/" + admin_base_path if not admin_base_path.endswith("/"): diff --git a/plane-src/apps/proxy/Caddyfile.aio.ce b/plane-src/apps/proxy/Caddyfile.aio.ce index e84f77c..8cda123 100644 --- a/plane-src/apps/proxy/Caddyfile.aio.ce +++ b/plane-src/apps/proxy/Caddyfile.aio.ce @@ -18,7 +18,7 @@ reverse_proxy localhost:3004 } - handle_path /god-mode* { + handle_path /nodedcsudo* { root * /app/admin try_files {path} {path}/ /index.html file_server diff --git a/plane-src/apps/proxy/Caddyfile.ce b/plane-src/apps/proxy/Caddyfile.ce index 699dd69..903e395 100644 --- a/plane-src/apps/proxy/Caddyfile.ce +++ b/plane-src/apps/proxy/Caddyfile.ce @@ -6,8 +6,8 @@ redir /spaces /spaces/ permanent reverse_proxy /spaces/* space:3000 - redir /god-mode /god-mode/ permanent - reverse_proxy /god-mode/* admin:3000 + redir /nodedcsudo /nodedcsudo/ permanent + reverse_proxy /nodedcsudo/* admin:3000 reverse_proxy /live/* live:3000 diff --git a/plane-src/apps/space/Dockerfile.space b/plane-src/apps/space/Dockerfile.space index 60d4a15..1e9069f 100644 --- a/plane-src/apps/space/Dockerfile.space +++ b/plane-src/apps/space/Dockerfile.space @@ -35,7 +35,7 @@ ENV VITE_API_BASE_PATH=$VITE_API_BASE_PATH ARG VITE_ADMIN_BASE_URL="" ENV VITE_ADMIN_BASE_URL=$VITE_ADMIN_BASE_URL -ARG VITE_ADMIN_BASE_PATH="/god-mode" +ARG VITE_ADMIN_BASE_PATH="/nodedcsudo" ENV VITE_ADMIN_BASE_PATH=$VITE_ADMIN_BASE_PATH ARG VITE_SPACE_BASE_URL="" diff --git a/plane-src/apps/web/Dockerfile.web b/plane-src/apps/web/Dockerfile.web index 38af19e..1493286 100644 --- a/plane-src/apps/web/Dockerfile.web +++ b/plane-src/apps/web/Dockerfile.web @@ -49,7 +49,7 @@ ENV VITE_API_BASE_URL=$VITE_API_BASE_URL ARG VITE_ADMIN_BASE_URL="" ENV VITE_ADMIN_BASE_URL=$VITE_ADMIN_BASE_URL -ARG VITE_ADMIN_BASE_PATH="/god-mode" +ARG VITE_ADMIN_BASE_PATH="/nodedcsudo" ENV VITE_ADMIN_BASE_PATH=$VITE_ADMIN_BASE_PATH ARG VITE_LIVE_BASE_URL="" diff --git a/plane-src/packages/constants/src/workspace.ts b/plane-src/packages/constants/src/workspace.ts index 6083c77..6a6aacb 100644 --- a/plane-src/packages/constants/src/workspace.ts +++ b/plane-src/packages/constants/src/workspace.ts @@ -15,6 +15,7 @@ export const RESTRICTED_URLS: string[] = [ "api", "create-workspace", "god-mode", + "nodedcsudo", "installations", "invitations", "onboarding",