diff --git a/flake.nix b/flake.nix index 2e8ea6c..52850d8 100644 --- a/flake.nix +++ b/flake.nix @@ -84,7 +84,6 @@ ExecStart = "${self.defaultPackage."${system}"}/bin/${script}"; EnvironmentFile = [ "${cfg.env.ldap}" - "${cfg.env.discord}" "${cfg.env.mail}" "${cfg.env.wolves}" ]; @@ -123,10 +122,6 @@ type = types.str; description = "Auth for the LDAP, has LDAP_HOST, LDAP_ADMIN, LDAP_ADMIN_PW"; }; - discord = mkOption rec { - type = types.str; - description = "Auth for the discord bot, has LDAP_DISCORD_AUTH"; - }; mail = mkOption rec { type = types.str; description = "Mail details, has EMAIL_SMTP, EMAIL_USER, EMAIL_PASS"; @@ -232,14 +227,12 @@ # multiple files EnvironmentFile = [ "${cfg.env.ldap}" - "${cfg.env.discord}" "${cfg.env.mail}" "${cfg.env.wolves}" ]; }; restartTriggers = [ "${cfg.env.ldap}" - "${cfg.env.discord}" "${cfg.env.mail}" "${cfg.env.wolves}" ]; diff --git a/src/lib.rs b/src/lib.rs index 0b3791a..793d31c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -185,7 +185,6 @@ pub struct Config { pub mail_user: String, pub mail_pass: String, pub ssh_root: String, - pub auth_discord: String, pub users_restricted: Vec, pub wolves_url: String, pub wolves_key: String, @@ -206,7 +205,6 @@ pub fn get_config() -> Config { mail_user: "".to_string(), mail_pass: "".to_string(), ssh_root: "skynet_old".to_string(), - auth_discord: "".to_string(), users_restricted: vec![], wolves_url: "".to_string(), wolves_key: "".to_string(), @@ -242,9 +240,6 @@ pub fn get_config() -> Config { if let Ok(x) = env::var("SSH_ROOT") { config.ssh_root = x.trim().to_string(); } - if let Ok(x) = env::var("LDAP_DISCORD_AUTH") { - config.auth_discord = x.trim().to_string(); - } if let Ok(x) = env::var("WOLVES_URL") { config.wolves_url = x.trim().to_string(); }