rust/lootalot
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

updates for prod env

Browse Source
This commit is contained in:
Arthur Gerbaud
2019-12-15 16:02:00 +01:00
parent 342a66475d
commit b19d56fd9a
2 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server.rs
View File

@@ -136,16 +136,6 @@ fn configure_api(config: &mut web::ServiceConfig) {
db_call(pool, Q::ClaimItems(*player, data.into_inner()))
},
))
.route(web::put().to_async(
|pool, (player, data): (PlayerId, ItemId)| {
db_call(pool, Q::ClaimItem(*player, *data))
},
))
.route(web::delete().to_async(
|pool, (player, data): (PlayerId, ItemId)| {
db_call(pool, Q::UnclaimItem(*player, *data))
},
)),
)
.service(
web::resource("/wealth")
@@ -294,12 +284,11 @@ fn enter_session(id: Identity, pool: AppPool) -> impl Future<Item = HttpResponse
}
pub fn serve() -> std::io::Result<()> {
let www_root: String = env::var("WWW_ROOT").expect("WWW_ROOT must be set");
let domain: String = env::var("DOMAIN").expect("DOMAIN must be set");
let pool = db::create_pool();
dbg!(&www_root);
println!("Serving Loot-a-lot on {}", domain);
let key = [0; 32]; // TODO: Use a real key
let domain = "http://localhost:8088";
HttpServer::new(move || {
App::new()
@@ -307,7 +296,7 @@ pub fn serve() -> std::io::Result<()> {
.configure(configure_api)
.wrap(
Cors::new()
.allowed_origin(domain)
.allowed_origin(&domain)
.allowed_methods(vec!["GET", "POST", "PUT", "DELETE", "OPTIONS"])
.max_age(3600),
)
@@ -321,7 +310,7 @@ pub fn serve() -> std::io::Result<()> {
.route("/session", web::get().to_async(enter_session))
.route("/login", web::get().to(login))
.route("/logout", web::get().to(logout))
.service(fs::Files::new("/", www_root.clone()).index_file("index.html"))
//.service(fs::Files::new("/", www_root.clone()).index_file("index.html"))
})
.bind("127.0.0.1:8088")?
.run()