Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Agent/Services/ConfigService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public ConnectionInfo GetConnectionInfo()
return new ConnectionInfo()
{
DeviceID = _debugGuid,
Host = "http://localhost:5000",
Host = "http://localhost:5001",
OrganizationID = AppConstants.DebugOrgId
};
}
Expand Down
2 changes: 1 addition & 1 deletion Desktop.Linux/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static async Task Main(string[] args)
var version = AppVersionHelper.GetAppVersion();
var logger = new FileLogger("Remotely_Desktop", version, "Program.cs");
var filePath = Environment.ProcessPath ?? Environment.GetCommandLineArgs().First();
var serverUrl = Debugger.IsAttached ? "http://localhost:5000" : string.Empty;
var serverUrl = Debugger.IsAttached ? "http://localhost:5001" : string.Empty;
var getEmbeddedResult = EmbeddedServerDataProvider.Instance.TryGetEmbeddedData(filePath);
if (getEmbeddedResult.IsSuccess)
{
Expand Down
4 changes: 2 additions & 2 deletions Server/Dockerfile.old
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM ubuntu:jammy

EXPOSE 5000
EXPOSE 5001

ENV ASPNETCORE_ENVIRONMENT="Production"
ENV ASPNETCORE_URLS="http://*:5000"
ENV ASPNETCORE_URLS="http://*:5001"

RUN \
apt-get -y update && \
Expand Down
4 changes: 2 additions & 2 deletions Server/Dockerfile.rootless
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM ubuntu:jammy

EXPOSE 5000
EXPOSE 5001

ENV ASPNETCORE_ENVIRONMENT="Production"
ENV ASPNETCORE_URLS="http://*:5000"
ENV ASPNETCORE_URLS="http://*:5001"

RUN \
apt-get -y update && \
Expand Down
4 changes: 2 additions & 2 deletions Server/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true,
"applicationUrl": "https://localhost:5001;http://localhost:5000"
"applicationUrl": "http://localhost:5001"
},
"IIS Express": {
"commandName": "IISExpress",
Expand All @@ -29,7 +29,7 @@
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"environmentVariables": {
"ASPNETCORE_URLS": "http://*:5000"
"ASPNETCORE_URLS": "http://*:5001"
},
"publishAllPorts": true,
"useSSL": false
Expand Down
24 changes: 12 additions & 12 deletions Utilities/Example_Apache_Config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,34 @@
#Forward once Websocket Connection has been upgraded.
RewriteEngine On
RewriteCond %{HTTP:Upgrade} =websocket [NC]
RewriteRule /(.*) ws://localhost:5000/$1 [P,L]
RewriteRule /(.*) ws://localhost:5001/$1 [P,L]
RewriteCond %{HTTP:Upgrade} !=websocket [NC]
RewriteRule /(.*) http://localhost:5000/$1 [P,L]
RewriteRule /(.*) http://localhost:5001/$1 [P,L]

ProxyPreserveHost On
#Proxy Requests to Remotely Server
<LocationMatch "/">
ProxyPass http://localhost:5000/
ProxyPassReverse http://localhost:5000/
ProxyPass http://localhost:5001/
ProxyPassReverse http://localhost:5001/
</LocationMatch>
<Location "/hubs/user">
ProxyPass http://localhost:5000/
ProxyPassReverse http://localhost:5000/
ProxyPass http://localhost:5001/
ProxyPassReverse http://localhost:5001/
</Location>

<LocationMatch "/hubs/service">
ProxyPass http://localhost:5000/
ProxyPassReverse http://localhost:5000/
ProxyPass http://localhost:5001/
ProxyPassReverse http://localhost:5001/
</LocationMatch>

<LocationMatch "/hubs/viewer">
ProxyPass http://localhost:5000/
ProxyPassReverse http://localhost:5000/
ProxyPass http://localhost:5001/
ProxyPassReverse http://localhost:5001/
</LocationMatch>

<LocationMatch "/hubs/desktop">
ProxyPass http://localhost:5000/
ProxyPassReverse http://localhost:5000/
ProxyPass http://localhost:5001/
ProxyPassReverse http://localhost:5001/
</LocationMatch>

ErrorLog ${APACHE_LOG_DIR}/error.log
Expand Down
10 changes: 5 additions & 5 deletions Utilities/Example_Nginx_Config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ server {
listen 80;
server_name app.example.com *.app.example.com;
location / {
proxy_pass http://localhost:5000;
proxy_pass http://localhost:5001;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection keep-alive;
Expand All @@ -12,7 +12,7 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
}
location /_blazor {
proxy_pass http://localhost:5000;
proxy_pass http://localhost:5001;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
Expand All @@ -22,7 +22,7 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
}
location /AgentHub {
proxy_pass http://localhost:5000;
proxy_pass http://localhost:5001;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
Expand All @@ -32,7 +32,7 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
}
location /ViewerHub {
proxy_pass http://localhost:5000;
proxy_pass http://localhost:5001;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
Expand All @@ -42,7 +42,7 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
}
location /CasterHub {
proxy_pass http://localhost:5000;
proxy_pass http://localhost:5001;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
Expand Down
4 changes: 1 addition & 3 deletions docker-compose/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ services:
remotely:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=5000
- ASPNETCORE_HTTPS_PORTS=5001
- ASPNETCORE_HTTP_PORTS=5001
ports:
- "5000:5000"
- "5001:5001"
volumes:
- ${APPDATA}/Microsoft/UserSecrets:/home/app/.microsoft/usersecrets:ro
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ services:
- /var/www/remotely:/app/AppData
restart: unless-stopped
ports:
- "5000:5000"
- "5001:5001"
networks:
- remotely
environment:
# ASPNETCORE environment variables should *not* be changed.
- ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_HTTP_PORTS=5000
- ASPNETCORE_HTTP_PORTS=5001

# Other ASP.NET Core configurations can be overridden here, such as Logging.
# See https://learn.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-8.0
Expand Down
Loading