beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small changes

Browse source
This commit is contained in:
Marcel Baumgartner 2023-09-06 17:40:56 +02:00
parent 732abe53e0
commit 74361b7a4a
2 changed files with 50 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Moonlight/App/Configuration/ConfigV1.cs
View file

@ -8,8 +8,7 @@ using Newtonsoft.Json;
public class ConfigV1 public class ConfigV1
{ {
[JsonProperty("Moonlight")] [JsonProperty("Moonlight")] public MoonlightData Moonlight { get; set; } = new();
public MoonlightData Moonlight { get; set; } = new();
public class MoonlightData public class MoonlightData
{ {
@ -50,7 +49,8 @@ public class ConfigV1
[JsonProperty("Cleanup")] public CleanupData Cleanup { get; set; } = new(); [JsonProperty("Cleanup")] public CleanupData Cleanup { get; set; } = new();
[JsonProperty("DiscordNotifications")] public DiscordNotificationsData DiscordNotifications { get; set; } = new(); [JsonProperty("DiscordNotifications")]
public DiscordNotificationsData DiscordNotifications { get; set; } = new();
[JsonProperty("Statistics")] public StatisticsData Statistics { get; set; } = new(); [JsonProperty("Statistics")] public StatisticsData Statistics { get; set; } = new();
@ -68,7 +68,7 @@ public class ConfigV1
public class LetsEncrypt public class LetsEncrypt
{ {
[JsonProperty("Enable")] [JsonProperty("Enable")]
[Description("Enable automatic lets encrypt certificate issuing")] [Description("Enable automatic lets encrypt certificate issuing. This is a beta feature")]
public bool Enable { get; set; } = false; public bool Enable { get; set; } = false;
[JsonProperty("ExpireEmail")] [JsonProperty("ExpireEmail")]
@ -102,7 +102,8 @@ public class ConfigV1
public class StripeData public class StripeData
{ {
[JsonProperty("ApiKey")] [JsonProperty("ApiKey")]
[Description("Put here your stripe api key if you add subscriptions. Currently the only billing option is stripe which is enabled by default and cannot be turned off. This feature is still experimental")] [Description(
"Put here your stripe api key if you add subscriptions. Currently the only billing option is stripe which is enabled by default and cannot be turned off. This feature is still experimental")]
public string ApiKey { get; set; } = ""; public string ApiKey { get; set; } = "";
} }
@ -136,7 +137,8 @@ public class ConfigV1
public long Uptime { get; set; } = 6; public long Uptime { get; set; } = 6;
[JsonProperty("Enable")] [JsonProperty("Enable")]
[Description("The cleanup system provides a fair way for stopping unused servers and staying stable even with overallocation. A detailed explanation: docs.endelon-hosting.de/erklaerungen/cleanup")] [Description(
"The cleanup system provides a fair way for stopping unused servers and staying stable even with overallocation. A detailed explanation: docs.endelon-hosting.de/erklaerungen/cleanup")]
public bool Enable { get; set; } = false; public bool Enable { get; set; } = false;
[JsonProperty("MinUptime")] [JsonProperty("MinUptime")]
@ -150,9 +152,7 @@ public class ConfigV1
[JsonProperty("Host")] public string Host { get; set; } = "your.database.host"; [JsonProperty("Host")] public string Host { get; set; } = "your.database.host";
[JsonProperty("Password")] [JsonProperty("Password")] [Blur] public string Password { get; set; } = "secret";
[Blur]
public string Password { get; set; } = "secret";
[JsonProperty("Port")] public long Port { get; set; } = 3306; [JsonProperty("Port")] public long Port { get; set; } = 3306;
@ -170,6 +170,7 @@ public class ConfigV1
[Blur] [Blur]
public string Token { get; set; } = Guid.NewGuid().ToString(); public string Token { get; set; } = Guid.NewGuid().ToString();
} }
public class DiscordBotData public class DiscordBotData
{ {
[JsonProperty("Enable")] [JsonProperty("Enable")]
@ -193,7 +194,8 @@ public class ConfigV1
public class DiscordNotificationsData public class DiscordNotificationsData
{ {
[JsonProperty("Enable")] [JsonProperty("Enable")]
[Description("The discord notification system sends you a message everytime a event like a new support chat message is triggered with usefull data describing the event")] [Description(
"The discord notification system sends you a message everytime a event like a new support chat message is triggered with usefull data describing the event")]
public bool Enable { get; set; } = false; public bool Enable { get; set; } = false;
[JsonProperty("WebHook")] [JsonProperty("WebHook")]
@ -230,19 +232,23 @@ public class ConfigV1
public class HeadersData public class HeadersData
{ {
[JsonProperty("Color")] [JsonProperty("Color")]
[Description("This specifies the color of the embed generated by platforms like discord when someone posts a link to your moonlight instance")] [Description(
"This specifies the color of the embed generated by platforms like discord when someone posts a link to your moonlight instance")]
public string Color { get; set; } = "#4b27e8"; public string Color { get; set; } = "#4b27e8";
[JsonProperty("Description")] [JsonProperty("Description")]
[Description("This specifies the description text of the embed generated by platforms like discord when someone posts a link to your moonlight instance and can also help google to index your moonlight instance correctly")] [Description(
"This specifies the description text of the embed generated by platforms like discord when someone posts a link to your moonlight instance and can also help google to index your moonlight instance correctly")]
public string Description { get; set; } = "the next generation hosting panel"; public string Description { get; set; } = "the next generation hosting panel";
[JsonProperty("Keywords")] [JsonProperty("Keywords")]
[Description("To help search engines like google to index your moonlight instance correctly you can specify keywords seperated by a comma here")] [Description(
"To help search engines like google to index your moonlight instance correctly you can specify keywords seperated by a comma here")]
public string Keywords { get; set; } = "moonlight"; public string Keywords { get; set; } = "moonlight";
[JsonProperty("Title")] [JsonProperty("Title")]
[Description("This specifies the title of the embed generated by platforms like discord when someone posts a link to your moonlight instance")] [Description(
"This specifies the title of the embed generated by platforms like discord when someone posts a link to your moonlight instance")]
public string Title { get; set; } = "Moonlight - endelon.link"; public string Title { get; set; } = "Moonlight - endelon.link";
} }
@ -252,9 +258,7 @@ public class ConfigV1
[JsonProperty("Server")] public string Server { get; set; } = "your.mail.host"; [JsonProperty("Server")] public string Server { get; set; } = "your.mail.host";
[JsonProperty("Password")] [JsonProperty("Password")] [Blur] public string Password { get; set; } = "secret";
[Blur]
public string Password { get; set; } = "secret";
[JsonProperty("Port")] public int Port { get; set; } = 465; [JsonProperty("Port")] public int Port { get; set; } = 465;
@ -292,19 +296,19 @@ public class ConfigV1
[JsonProperty("ClientId")] public string ClientId { get; set; } [JsonProperty("ClientId")] public string ClientId { get; set; }
[JsonProperty("ClientSecret")] [JsonProperty("ClientSecret")] [Blur] public string ClientSecret { get; set; }
[Blur]
public string ClientSecret { get; set; }
} }
public class RatingData public class RatingData
{ {
[JsonProperty("Enabled")] [JsonProperty("Enabled")]
[Description("The rating systems shows a user who is registered longer than the set amout of days a popup to rate this platform if he hasnt rated it before")] [Description(
"The rating systems shows a user who is registered longer than the set amout of days a popup to rate this platform if he hasnt rated it before")]
public bool Enabled { get; set; } = false; public bool Enabled { get; set; } = false;
[JsonProperty("Url")] [JsonProperty("Url")]
[Description("This is the url a user who rated above a set limit is shown to rate you again. Its recommended to put your google or trustpilot rate link here")] [Description(
"This is the url a user who rated above a set limit is shown to rate you again. Its recommended to put your google or trustpilot rate link here")]
public string Url { get; set; } = "https://link-to-google-or-smth"; public string Url { get; set; } = "https://link-to-google-or-smth";
[JsonProperty("MinRating")] [JsonProperty("MinRating")]
@ -319,7 +323,8 @@ public class ConfigV1
public class SecurityData public class SecurityData
{ {
[JsonProperty("Token")] [JsonProperty("Token")]
[Description("This is the moonlight app token. It is used to encrypt and decrypt data and validate tokens and sessions")] [Description(
"This is the moonlight app token. It is used to encrypt and decrypt data and validate tokens and sessions")]
[Blur] [Blur]
public string Token { get; set; } = Guid.NewGuid().ToString(); public string Token { get; set; } = Guid.NewGuid().ToString();
@ -335,7 +340,8 @@ public class ConfigV1
[JsonProperty("ReCaptcha")] public ReCaptchaData ReCaptcha { get; set; } = new(); [JsonProperty("ReCaptcha")] public ReCaptchaData ReCaptcha { get; set; } = new();
[JsonProperty("BlockDatacenterIps")] [JsonProperty("BlockDatacenterIps")]
[Description("If this option is enabled, users with an ip from datacenters will not be able to access the panel")] [Description(
"If this option is enabled, users with an ip from datacenters will not be able to access the panel")]
public bool BlockDatacenterIps { get; set; } = true; public bool BlockDatacenterIps { get; set; } = true;
[JsonProperty("AllowCloudflareIps")] [JsonProperty("AllowCloudflareIps")]
@ -346,22 +352,20 @@ public class ConfigV1
public class ReCaptchaData public class ReCaptchaData
{ {
[JsonProperty("Enable")] [JsonProperty("Enable")]
[Description("Enables repatcha at places like the register page. For information how to get your recaptcha credentails go to google.com/recaptcha/about/")] [Description(
"Enables repatcha at places like the register page. For information how to get your recaptcha credentails go to google.com/recaptcha/about/")]
public bool Enable { get; set; } = false; public bool Enable { get; set; } = false;
[JsonProperty("SiteKey")] [JsonProperty("SiteKey")] [Blur] public string SiteKey { get; set; } = "recaptcha site key here";
[Blur]
public string SiteKey { get; set; } = "recaptcha site key here";
[JsonProperty("SecretKey")] [JsonProperty("SecretKey")] [Blur] public string SecretKey { get; set; } = "recaptcha secret here";
[Blur]
public string SecretKey { get; set; } = "recaptcha secret here";
} }
public class SentryData public class SentryData
{ {
[JsonProperty("Enable")] [JsonProperty("Enable")]
[Description("Sentry is a way to monitor application crashes and performance issues in real time. Enable this option only if you set a sentry dsn")] [Description(
"Sentry is a way to monitor application crashes and performance issues in real time. Enable this option only if you set a sentry dsn")]
public bool Enable { get; set; } = false; public bool Enable { get; set; } = false;
[JsonProperty("Dsn")] [JsonProperty("Dsn")]

2
Moonlight/App/Services/LetsEncryptService.cs
View file

@ -166,8 +166,6 @@ public class LetsEncryptService
if (context == null) if (context == null)
return null; return null;
Logger.Info(domain);
return Certificate; return Certificate;
} }
} }