Browse Source

Updated other workspace members

pull/19/head
Emi Tatsuo 1 month ago
parent
commit
aaac9d0c93
Signed by untrusted user: alch_emii GPG Key ID: 68FAB2E2E6DFC98B
5 changed files with 11 additions and 13 deletions
  1. +2
    -4
      Cargo.toml
  2. +1
    -1
      majc/Cargo.toml
  3. +2
    -3
      pilno/karnycukta/Cargo.toml
  4. +2
    -2
      site/Cargo.toml
  5. +4
    -3
      site/src/main.rs

+ 2
- 4
Cargo.toml View File

@ -20,8 +20,8 @@ once_cell = "1.4"
rustls = { version = "0.19", optional = true, features = ["dangerous_configuration"] }
structopt = "0.3"
thiserror = "1"
tokio-rustls = { version = "0.21", features = ["dangerous_configuration"], optional = true }
tokio = { version = "0.3", features = ["full"], optional = true }
tokio-rustls = { version = "0.21", features = ["dangerous_configuration"] }
tokio = { version = "0.3", features = ["full"] }
url = "2"
webpki-roots = { version = "0.20", optional = true }
webpki = { version = "0.21.0", optional = true }
@ -35,10 +35,8 @@ pretty_env_logger = "0.4"
default = ["client", "server"]
client = [
"tokio-rustls",
"webpki",
"webpki-roots",
"tokio",
]
server = [


+ 1
- 1
majc/Cargo.toml View File

@ -11,7 +11,7 @@ cursive = "0.15"
log = "0.4"
url = "2"
webpki = "0.21.0"
rustls = { version = "0.18", features = ["dangerous_configuration"] }
rustls = { version = "0.19", features = ["dangerous_configuration"] }
smol = { version = "0.3", features = ["tokio02"] }
maj = { path = ".." }


+ 2
- 3
pilno/karnycukta/Cargo.toml View File

@ -8,15 +8,14 @@ edition = "2018"
[dependencies]
anyhow = "1"
async-std = "1.5"
async-trait = "0"
atom_syndication = "0.9"
chrono = "*"
log = "0"
pretty_env_logger = "0.4"
webpki = "0.21.0"
rustls = { version = "0.18", features = ["dangerous_configuration"] }
rustls = { version = "0.19", features = ["dangerous_configuration"] }
structopt = "0.3"
tokio = { version = "0.2", features = ["full"] }
tokio = { version = "0.3", features = ["full"] }
maj = { path = "../..", features = ["server", "client"], default-features = false }

+ 2
- 2
site/Cargo.toml View File

@ -9,7 +9,6 @@ build = "build.rs"
[dependencies]
anyhow = "1"
async-std = "1.5"
async-trait = "0"
dnd_dice_roller = "0.3"
env_logger = "0"
@ -17,13 +16,14 @@ log = "0"
mime = "0.3.0"
percent-encoding = "2"
rand = "0"
rustls = { version = "0.18", features = ["dangerous_configuration"] }
rustls = { version = "0.19", features = ["dangerous_configuration"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
smol = { version = "0.3", features = ["tokio02"] }
structopt = "0.3"
url = "2"
warp = "0.2"
tokio = { version = "0.3", features = ["rt"] }
maj = { path = "..", features = ["server"], default-features = false }


+ 4
- 3
site/src/main.rs View File

@ -1,8 +1,8 @@
use async_std::task;
use rustls::{
internal::pemfile::{certs, pkcs8_private_keys},
AllowAnyAnonymousOrAuthenticatedClient, Certificate, PrivateKey, RootCertStore, ServerConfig,
};
use std::{
fs::File,
io::{self, BufReader},
@ -64,7 +64,8 @@ fn load_keys(path: &Path) -> io::Result<Vec<PrivateKey>> {
.map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid key"))
}
fn main() -> Result<(), maj::server::Error> {
#[tokio::main]
async fn main() -> Result<(), maj::server::Error> {
env_logger::init();
let opts = Options::from_args();
let certs = load_certs(&opts.cert).unwrap();
@ -96,7 +97,7 @@ fn main() -> Result<(), maj::server::Error> {
thread::spawn(move || http::run(h.clone(), port));
}
task::block_on(maj::server::serve(h.clone(), config, opts.host, opts.port))?;
maj::server::serve(h.clone(), config, opts.host, opts.port).await?;
Ok(())
}


Loading…
Cancel
Save