Parcourir la source

Added config for bimng bind address, port and redis

clement il y a 11 mois
Parent
commit
0eb8875f59
2 fichiers modifiés avec 21 ajouts et 11 suppressions
  1. 15 11
      src/main.rs
  2. 6 0
      src/settings.toml.example

+ 15 - 11
src/main.rs

@@ -14,7 +14,11 @@ async fn main() -> std::io::Result<()> {
     .build()
     .unwrap();
 
-    let redis_store = match RedisSessionStore::new("redis://127.0.0.1:6379").await {
+    let bind_addr: String = settings.get("bimng.bindaddr").unwrap();
+    let bind_port: u16 = settings.get("bimng.bindport").unwrap();
+    let redis_addr: String = settings.get("bimng.redisaddr").unwrap();
+
+    let redis_store = match RedisSessionStore::new(redis_addr).await {
         Ok(redis_store) => {
             redis_store
         }
@@ -26,17 +30,17 @@ async fn main() -> std::io::Result<()> {
 
     let signing_key = Key::generate();
 
-    let config = LdapConfig {
-        hostname: settings.get("hostname").unwrap(),
-        port: settings.get("port").unwrap(),
-        basedn: settings.get("basedn").unwrap(),
-        groupsdn: settings.get("groupsdn").unwrap(),
-        binddn: settings.get("binddn").unwrap(),
-        bindpw: settings.get("bindpw").unwrap(),
-        starttls: settings.get("starttls").unwrap(),
+    let ldap_config = LdapConfig {
+        hostname: settings.get("ldap.hostname").unwrap(),
+        port: settings.get("ldap.port").unwrap(),
+        basedn: settings.get("ldap.basedn").unwrap(),
+        groupsdn: settings.get("ldap.groupsdn").unwrap(),
+        binddn: settings.get("ldap.binddn").unwrap(),
+        bindpw: settings.get("ldap.bindpw").unwrap(),
+        starttls: settings.get("ldap.starttls").unwrap(),
     };
 
-    let ldap_wrapper = LdapWrapper::new(config);
+    let ldap_wrapper = LdapWrapper::new(ldap_config);
 
     HttpServer::new(move ||  {
         App::new()
@@ -56,7 +60,7 @@ async fn main() -> std::io::Result<()> {
         .route("/addsshkey", web::post().to(handler::add_ssh_key))
         .route("/delsshkey", web::post().to(handler::del_ssh_key))
     })
-    .bind(("127.0.0.1", 8080))?
+    .bind((bind_addr, bind_port))?
     .run()
     .await
 }

+ 6 - 0
src/settings.toml.example

@@ -1,3 +1,9 @@
+[bimng]
+bindaddr = "0.0.0.0"
+bindport = 8080
+redisaddr = "redis://127.0.0.1:6379"
+
+[ldap]
 hostname = "example.com"
 port = "389"
 basedn = "ou=people,dc=example,dc=com"