diff --git a/Cargo.lock b/Cargo.lock index 70008cf..6e42ffb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1031,7 +1031,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] -name = "redlib" +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redsunlib" version = "0.34.0" dependencies = [ "askama", @@ -1066,15 +1075,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags", -] - [[package]] name = "regex" version = "1.10.4" diff --git a/Cargo.toml b/Cargo.toml index e3f2cd5..8c865d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "redlib" +name = "redsunlib" description = " Alternative private front-end to Reddit" license = "AGPL-3.0" repository = "https://git.stardust.wtf/iridium/redlib" diff --git a/Dockerfile.old b/Dockerfile.old deleted file mode 100644 index 9412565..0000000 --- a/Dockerfile.old +++ /dev/null @@ -1,20 +0,0 @@ -FROM alpine:3.19 - -ARG TARGET - -RUN apk add --no-cache curl - -RUN curl -L https://github.com/redlib-org/redlib/releases/latest/download/redlib-${TARGET}.tar.gz | \ - tar xz -C /usr/local/bin/ - -RUN adduser --home /nonexistent --no-create-home --disabled-password redlib -USER redlib - -# Tell Docker to expose port 8080 -EXPOSE 8080 - -# Run a healthcheck every minute to make sure redlib is functional -HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1 - -CMD ["redlib"] - diff --git a/compose.dev.yaml b/compose.dev.yaml index 8203b34..354a66e 100644 --- a/compose.dev.yaml +++ b/compose.dev.yaml @@ -2,25 +2,25 @@ version: "3.8" services: - redlib: + redsunlib: build: . restart: always - container_name: "redlib" + container_name: "redsunlib" ports: - 8080:8080 # Specify `127.0.0.1:8080:8080` instead if using a reverse proxy user: nobody read_only: true security_opt: - no-new-privileges:true - # - seccomp=seccomp-redlib.json + # - seccomp=seccomp-redsunlib.json cap_drop: - ALL networks: - - redlib + - redsunlib healthcheck: test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"] interval: 5m timeout: 3s networks: - redlib: + redsunlib: diff --git a/compose.yaml b/compose.yaml index 493e37e..dd47612 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,26 +1,24 @@ services: - redlib: - image: quay.io/redlib/redlib:latest - # image: quay.io/redlib/redlib:latest-arm # uncomment if you use arm64 - # image: quay.io/redlib/redlib:latest-armv7 # uncomment if you use armv7 + redsunlib: + image: git.stardust.wtf/iridium/redsunlib:latest restart: always - container_name: "redlib" + container_name: "redsunlib" ports: - 8080:8080 # Specify `127.0.0.1:8080:8080` instead if using a reverse proxy user: nobody read_only: true security_opt: - no-new-privileges:true - # - seccomp=seccomp-redlib.json + # - seccomp=seccomp-redsunlib.json cap_drop: - ALL env_file: .env networks: - - redlib + - redsunlib healthcheck: test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"] interval: 5m timeout: 3s networks: - redlib: + redsunlib: diff --git a/seccomp-redlib.json b/seccomp-redsunlib.json similarity index 100% rename from seccomp-redlib.json rename to seccomp-redsunlib.json diff --git a/src/main.rs b/src/main.rs index ee2da5a..e228dcd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -166,7 +166,7 @@ async fn main() { let listener = [address, ":", port].concat(); - println!("Starting Redlib..."); + println!("Starting Redsunlib..."); // Begin constructing a server let mut app = server::Server::new(); @@ -373,7 +373,7 @@ async fn main() { // Default service in case no routes match app.at("/*").get(|req| error(req, "Nothing here").boxed()); - println!("Running Redlib v{} on {listener}!", env!("CARGO_PKG_VERSION")); + println!("Running Redsunlib v{} on {listener}!", env!("CARGO_PKG_VERSION")); let server = app.listen(&listener); diff --git a/static/apple-touch-icon.png b/static/apple-touch-icon.png index 3ca59e9..01451ad 100644 Binary files a/static/apple-touch-icon.png and b/static/apple-touch-icon.png differ diff --git a/static/favicon.ico b/static/favicon.ico index 364071c..0141ca4 100644 Binary files a/static/favicon.ico and b/static/favicon.ico differ diff --git a/static/favicon.png b/static/favicon.png index 333f706..ed52832 100644 Binary files a/static/favicon.png and b/static/favicon.png differ diff --git a/static/logo.png b/static/logo.png index fd8a171..01451ad 100644 Binary files a/static/logo.png and b/static/logo.png differ diff --git a/static/logo.svg b/static/logo.svg index 7f60733..cc12f7e 100644 --- a/static/logo.svg +++ b/static/logo.svg @@ -1 +1,33 @@ - + + + + + + + + + + diff --git a/static/logo_full.png b/static/logo_full.png new file mode 100644 index 0000000..43f9ab8 Binary files /dev/null and b/static/logo_full.png differ diff --git a/templates/base.html b/templates/base.html index 5d21f9b..84dc9c8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -35,7 +35,7 @@