From dfffa83f2c5cd36949ed7f6447c3aa7b57f28cee Mon Sep 17 00:00:00 2001 From: Apollo3zehn Date: Thu, 28 Mar 2024 22:15:38 +0100 Subject: [PATCH] Update org name --- README.md | 2 +- setup/docker/docker-compose.yml | 6 +++--- setup/docker/setup-main.sh | 4 ++-- setup/docker/setup-satellite.sh | 6 +++--- solution.json | 10 +++++----- src/Nexus.Sources.Remote/Remote.cs | 4 ++-- src/remoting/python-remoting/setup.py | 2 +- tests/Nexus.Sources.Remote.Tests/SetupDockerTests.cs | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 9188243..1cff0f8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Nexus Remote Data Source -[![GitHub Actions](https://github.com/malstroem-labs/nexus-sources-remote/actions/workflows/build-and-publish.yml/badge.svg?branch=master)](https://github.com/malstroem-labs/nexus-sources-remote/actions) +[![GitHub Actions](https://github.com/nexus-main/nexus-sources-remote/actions/workflows/build-and-publish.yml/badge.svg?branch=master)](https://github.com/nexus-main/nexus-sources-remote/actions) The RPC data source is different from normal data sources in that it allows any code to be executed which imposes a security risk. Additionally, the command to be executed (e.g. python) might not exist in the current environment. Nexus is distributed as Docker Container with minimum dependencies. Therefore another solution must exist to extend the system. An option would be to use Docker-in-Docker (`dind`) and start a new container which is just another command for the RCP data source. The container itself could be a calculation-only environment with network access (but no drive access). diff --git a/setup/docker/docker-compose.yml b/setup/docker/docker-compose.yml index b27554f..1e7b3f9 100644 --- a/setup/docker/docker-compose.yml +++ b/setup/docker/docker-compose.yml @@ -7,7 +7,7 @@ services: image: mcr.microsoft.com/dotnet/sdk:8.0 volumes: - /var/lib/nexus/docker/nexus-main/.ssh:/root/.ssh - entrypoint: bash -c "cd; curl -s -O 'https://raw.githubusercontent.com/malstroem-labs/nexus-sources-remote/master/setup/docker/setup-main.sh'; source 'setup-main.sh'" + entrypoint: bash -c "cd; curl -s -O 'https://raw.githubusercontent.com/nexus-main/nexus-sources-remote/master/setup/docker/setup-main.sh'; source 'setup-main.sh'" restart: always satellite-python: @@ -15,7 +15,7 @@ services: image: python:3.9.0 volumes: - /var/lib/nexus/docker/nexus-python/.ssh:/root/.ssh - entrypoint: bash -c "satellite_id=python;cd; curl -s -O 'https://raw.githubusercontent.com/malstroem-labs/nexus-sources-remote/master/setup/docker/setup-satellite.sh'; source 'setup-satellite.sh'" + entrypoint: bash -c "satellite_id=python;cd; curl -s -O 'https://raw.githubusercontent.com/nexus-main/nexus-sources-remote/master/setup/docker/setup-satellite.sh'; source 'setup-satellite.sh'" restart: always satellite-nexus: @@ -23,5 +23,5 @@ services: image: mcr.microsoft.com/dotnet/sdk:8.0 volumes: - /var/lib/nexus/docker/nexus-dotnet/.ssh:/root/.ssh - entrypoint: bash -c "satellite_id=dotnet;cd; curl -s -O 'https://raw.githubusercontent.com/malstroem-labs/nexus-sources-remote/master/setup/docker/setup-satellite.sh'; source 'setup-satellite.sh'" + entrypoint: bash -c "satellite_id=dotnet;cd; curl -s -O 'https://raw.githubusercontent.com/nexus-main/nexus-sources-remote/master/setup/docker/setup-satellite.sh'; source 'setup-satellite.sh'" restart: always diff --git a/setup/docker/setup-main.sh b/setup/docker/setup-main.sh index 34d3b25..37454ac 100644 --- a/setup/docker/setup-main.sh +++ b/setup/docker/setup-main.sh @@ -8,8 +8,8 @@ echo "${green}Set up SSH client${white}" apt update apt install openssh-client -y -echo "Clone repository ${green}https://github.com/malstroem-labs/nexus-sources-remote${white}" -git clone https://github.com/malstroem-labs/nexus-sources-remote +echo "Clone repository ${green}https://github.com/nexus-main/nexus-sources-remote${white}" +git clone https://github.com/nexus-main/nexus-sources-remote cd nexus-sources-remote mkdir -p /var/lib/nexus diff --git a/setup/docker/setup-satellite.sh b/setup/docker/setup-satellite.sh index a42fccf..f9c1907 100644 --- a/setup/docker/setup-satellite.sh +++ b/setup/docker/setup-satellite.sh @@ -11,9 +11,9 @@ sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' '/etc/ssh/ss service ssh start echo "${green}Load run.sh, run-user.sh and ${satellite_id}/satellite.sh scripts${white}" -curl -s -O 'https://raw.githubusercontent.com/malstroem-labs/nexus-sources-remote/master/setup/docker/run.sh' -curl -s -O 'https://raw.githubusercontent.com/malstroem-labs/nexus-sources-remote/master/setup/docker/run-user.sh' -curl -s -O "https://raw.githubusercontent.com/malstroem-labs/nexus-sources-remote/master/setup/docker/${satellite_id}/satellite.sh" +curl -s -O 'https://raw.githubusercontent.com/nexus-main/nexus-sources-remote/master/setup/docker/run.sh' +curl -s -O 'https://raw.githubusercontent.com/nexus-main/nexus-sources-remote/master/setup/docker/run-user.sh' +curl -s -O "https://raw.githubusercontent.com/nexus-main/nexus-sources-remote/master/setup/docker/${satellite_id}/satellite.sh" mkdir -p /var/lib/nexus touch "/var/lib/nexus/ready" diff --git a/solution.json b/solution.json index 5fa5832..969de84 100644 --- a/solution.json +++ b/solution.json @@ -1,9 +1,9 @@ { - "authors": "https://github.com/malstroem-labs", - "company": "https://github.com/malstroem-labs", - "copyright": "malstroem-labs", + "authors": "https://github.com/nexus-main", + "company": "https://github.com/nexus-main", + "copyright": "nexus-main", "product": "Nexus.Sources.Remote", "license": "MIT", - "project-url": "https://malstroem-labs.github.io/Nexus", - "repository-url": "https://github.com/malstroem-labs/nexus-sources-remote" + "project-url": "https://nexus-main.github.io/Nexus", + "repository-url": "https://github.com/nexus-main/nexus-sources-remote" } \ No newline at end of file diff --git a/src/Nexus.Sources.Remote/Remote.cs b/src/Nexus.Sources.Remote/Remote.cs index 3481034..9ea341f 100644 --- a/src/Nexus.Sources.Remote/Remote.cs +++ b/src/Nexus.Sources.Remote/Remote.cs @@ -11,8 +11,8 @@ namespace Nexus.Sources; [ExtensionDescription( "Provides access to remote databases", - "https://github.com/malstroem-labs/nexus-sources-remote", - "https://github.com/malstroem-labs/nexus-sources-remote")] + "https://github.com/nexus-main/nexus-sources-remote", + "https://github.com/nexus-main/nexus-sources-remote")] public partial class Remote : IDataSource, IDisposable { #region Fields diff --git a/src/remoting/python-remoting/setup.py b/src/remoting/python-remoting/setup.py index 1c35b80..ec65ed0 100644 --- a/src/remoting/python-remoting/setup.py +++ b/src/remoting/python-remoting/setup.py @@ -24,7 +24,7 @@ long_description=long_description, long_description_content_type="text/markdown", author=str(os.getenv("AUTHORS")), - url="https://github.com/malstroem-labs/nexus-sources-remote", + url="https://github.com/nexus-main/nexus-sources-remote", packages=[ "nexus_remoting" ], diff --git a/tests/Nexus.Sources.Remote.Tests/SetupDockerTests.cs b/tests/Nexus.Sources.Remote.Tests/SetupDockerTests.cs index c00350f..928aba1 100644 --- a/tests/Nexus.Sources.Remote.Tests/SetupDockerTests.cs +++ b/tests/Nexus.Sources.Remote.Tests/SetupDockerTests.cs @@ -94,7 +94,7 @@ private static DataSourceContext CreateContext(string satelliteId, string comman ["listen-address"] = JsonSerializer.SerializeToElement("0.0.0.0"), ["template"] = JsonSerializer.SerializeToElement("docker"), ["command"] = JsonSerializer.SerializeToElement(command), - ["git-url"] = JsonSerializer.SerializeToElement($"https://github.com/malstroem-labs/nexus-remoting-template-{satelliteId}"), + ["git-url"] = JsonSerializer.SerializeToElement($"https://github.com/nexus-main/nexus-remoting-template-{satelliteId}"), ["git-tag"] = JsonSerializer.SerializeToElement(version) }, RequestConfiguration: default