From b81a293615f0364a5f4e97e993b1ba682efdc57b Mon Sep 17 00:00:00 2001 From: Madpeterz <57852827+Madpeterz@users.noreply.github.com> Date: Fri, 4 Jun 2021 22:41:07 +0100 Subject: [PATCH] update docker ENV values --- Dockerfile | 25 ++++++++----------------- Shared/Json/JsonConfig.cs | 2 -- Shared/Json/JsonConfigApi.cs | 10 +--------- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13af006..eb78233 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,35 +27,26 @@ COPY --from=publish /app/publish . ENV Basic_BotUserName='' ENV Basic_BotPassword='' ENV Basic_HomeRegions='Viserion/50/140/23' -ENV Basic_LoginLocation='home' ENV Basic_AvoidRestartRegions='Just the Tip/60/96/1490' - -ENV Security_MasterUsername='Madpeter Zond' -ENV Security_SubMasters='X X,Y Y,Z Z' +ENV Basic_LoginLocation='home' +ENV Security_MasterUsername='' +ENV Security_SubMasters='' ENV Security_SignedCommandkey='' ENV Security_WebUIKey='' - -ENV Setting_AllowRLV='false' ENV Setting_AllowFunds='false' -ENV Setting_LogCommands='false' -ENV Setting_DefaultSit_UUID='' ENV Setting_loginURI='secondlife' -ENV Setting_Tracker='false' - +ENV Setting_Tracker='Event' ENV DiscordFull_Enable='false' ENV DiscordFull_Token='' ENV DiscordFull_ServerID='' ENV DiscordFull_Keep_GroupChat='false' - ENV Http_Enable='false' ENV Http_Host='docker' - -ENV Name2Key_Enable='false' -ENV Name2Key_Url='http://localhost:1234' -ENV Name2Key_Key='magic' - ENV Log2File_Enable='false' -ENV Log2File_Level=1 +ENV Log2File_Level='1' +ENV Setting_LogCommands='false' +ENV Agent_Channel='auto' +ENV Agent_Version='auto' EXPOSE 80 ENV ASPNETCORE_URLS http://+:80 diff --git a/Shared/Json/JsonConfig.cs b/Shared/Json/JsonConfig.cs index 1331f42..dc44cbf 100644 --- a/Shared/Json/JsonConfig.cs +++ b/Shared/Json/JsonConfig.cs @@ -82,9 +82,7 @@ namespace BetterSecondBotShared.Json // Settings - public bool Setting_AllowRLV { get; set; } public bool Setting_AllowFunds { get; set; } - public string Setting_DefaultSit_UUID { get; set; } public string Setting_loginURI { get; set; } public string Setting_Tracker { get; set; } diff --git a/Shared/Json/JsonConfigApi.cs b/Shared/Json/JsonConfigApi.cs index 6b231ea..80480f8 100644 --- a/Shared/Json/JsonConfigApi.cs +++ b/Shared/Json/JsonConfigApi.cs @@ -67,18 +67,10 @@ namespace BetterSecondBotShared.Json protected string GetHelp_Settings(string cmd) { // Settings - if (cmd == "Setting_AllowRLV") - { - return "Enable the RLV api interface"; - } - else if (cmd == "Setting_AllowFunds") + if (cmd == "Setting_AllowFunds") { return "Allow the bot to transfer L$ and get a non zero balance"; } - else if (cmd == "Setting_DefaultSit_UUID") - { - return "UUID of a object the bot should attempt to sit on after logging in"; - } else if (cmd == "Setting_loginURI") { return "the URI to login to (leave as \"secondlife\" unless you know what your doing!)";