Skip to content

Commit 1e8d6ec

Browse files
committed
very fixed
1 parent 6c5c0e5 commit 1e8d6ec

File tree

9 files changed

+37
-41
lines changed

9 files changed

+37
-41
lines changed

Cargo.lock

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

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ COPY server/migrations ./migrations
1616
RUN touch src/main.rs && cargo build --release
1717

1818
FROM debian:trixie-slim AS runtime
19-
COPY --from=server-builder /server/target/release/open-erase-server /open-erase-server
19+
COPY --from=server-builder /server/target/release/server /server
2020
COPY --from=web-builder /web/dist /dist
21-
ENTRYPOINT [ "/open-erase-server" ]
21+
ENTRYPOINT [ "/server" ]
2222
EXPOSE 3000
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
HOOKS=(base udev modconf archiso block filesystems)
2-
COMPRESSION="xz"
3-
COMPRESSION_OPTIONS=(-9e)

client/x86_64/iso/pacman.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ LocalFileSigLevel = Optional
7676
#Include = /etc/pacman.d/mirrorlist
7777

7878
[core]
79-
Server = [url]https://archive.archlinux.org/repos/2025/05/11/core/os/x86_64[/url]
8079
Include = /etc/pacman.d/mirrorlist
8180

8281
#[extra-testing]
@@ -99,3 +98,4 @@ Include = /etc/pacman.d/mirrorlist
9998
#[custom]
10099
#SigLevel = Optional TrustAll
101100
#Server = file:///home/custompkgs
101+

client/x86_64/iso/profiledef.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ iso_application="open-erase client for securely erasing x86 devices"
88
iso_version="0.1.0"
99
install_dir="arch"
1010
buildmodes=('iso')
11-
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
12-
'uefi-ia32.grub.esp' 'uefi-ia32.grub.eltorito' 'uefi-x64.grub.esp' 'uefi-x64.grub.eltorito')
11+
bootmodes=('bios.syslinux' 'uefi.grub')
1312
arch="x86_64"
1413
pacman_conf="pacman.conf"
15-
airootfs_image_type="squashfs"
16-
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
14+
airootfs_image_type="erofs"
15+
airootfs_image_tool_options=('-zlzma,109' -E 'ztailpacking')
1716
bootstrap_tarball_compression=(zstd -c -T0 --long -19)
1817
file_permissions=(
1918
["/etc/shadow"]="0:0:400"

iso-builder.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
FROM archlinux:base-20250511.0.348143 AS iso-builder
1+
FROM archlinux:base AS iso-builder
22
WORKDIR /iso
33
COPY client/x86_64/iso/ ./
4-
COPY client/x86_64/iso/pacman.conf /etc/pacman.conf
54
RUN pacman -Syu --noconfirm archiso grub

server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "open-erase-server"
2+
name = "server"
33
version = "0.1.0"
44
edition = "2024"
55

server/migrations/20251010120109_refresh_tokens.up.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CREATE TABLE refresh_tokens (
66
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
77
);
88

9-
CREATE INDEX idx_refresh_tokens_user_uuid ON refresh_tokens(user_uuid);
9+
CREATE INDEX idx_refresh_tokens_user_uuid ON refresh_tokens(user_id);
1010
CREATE INDEX idx_refresh_tokens_token_hash ON refresh_tokens(token_hash);
1111

1212
CREATE TRIGGER update_refresh_tokens_updated_at

server/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use serde::Deserialize;
44

55
const CONFIG_FILE_PATH: &str = "Server.toml";
66
const DEFAULT_ISSUER: &str = "open-erase";
7-
const DEFAULT_ACCESS_TOKEN_VALIDITY_SECS: u64 = 60 * 15; // 15min
7+
const DEFAULT_ACCESS_TOKEN_VALIDITY_SECS: u64 = 60 * 15;
88

99
#[derive(Debug, Clone, Deserialize)]
1010
#[serde(default)]

0 commit comments

Comments
 (0)