Skip to content

Commit 1f5a10b

Browse files
committed
Added
1 parent 3cae0b5 commit 1f5a10b

File tree

8 files changed

+181
-192
lines changed

8 files changed

+181
-192
lines changed

Cargo.lock

Lines changed: 33 additions & 119 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ version = "0.1.0"
44
edition = "2024"
55

66
[dependencies]
7-
axum = "0.8.1"
87
anyhow = "1.0.97"
98
socketioxide = "0.16.1"
109
rusqlite = { version = "0.34.0", features = ["bundled"] }
@@ -14,7 +13,10 @@ reqwest = { version = "0.12.14", features = ["blocking", "rustls-tls", "json"] }
1413
env_logger = "0.11.7"
1514
log = "0.4.26"
1615
chrono = "0.4.40"
17-
hyper-reverse-proxy = "0.5.1"
18-
hyper = { version = "0.14.32", features = ["full"] }
16+
axum = { version = "0.8.1", features = ["http2"] }
1917
tokio = { version = "1", features = ["full"] }
20-
rand = "0.8.5"
18+
rand = "0.8.5"
19+
hyper-util = "0.1.10"
20+
tower = "0.5.2"
21+
hyper = "1.6.0"
22+
tokio-tungstenite = "0.26.2"

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
services:
22
etherpad1:
3-
image: etherpad/etherpad
3+
image: etherpad/etherpad:develop
44
container_name: etherpad1
55
ports:
66
- "9001:9001"
77
volumes:
88
- "./support/settings.json:/opt/etherpad-lite/settings.json"
99
- "./test1:/opt/etherpad-lite/var"
1010
etherpad2:
11-
image: etherpad/etherpad
11+
image: etherpad/etherpad:develop
1212
container_name: etherpad2
1313
ports:
1414
- "9002:9001"
@@ -17,7 +17,7 @@ services:
1717
- "./test2:/opt/etherpad-lite/var"
1818
etherpad3:
1919
container_name: etherpad3
20-
image: etherpad/etherpad
20+
image: etherpad/etherpad:develop
2121
ports:
2222
- "9003:9001"
2323
volumes:

src/db.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ pub struct DB {
1010
impl DB {
1111
pub fn new(filename: &str) -> DB {
1212
let conn = Connection::open(filename).expect("Unable to open database");
13-
conn.execute("PRAGMA synchronous=NORMAL;", []).unwrap();
14-
conn.execute("PRAGMA journal_mode=WAL;", []).unwrap();
1513
conn.execute("CREATE TABLE IF NOT EXISTS pad (id TEXT, data TEXT);", []).unwrap();
1614
DB {
1715
conn

0 commit comments

Comments
 (0)