Compare commits

...

3 commits

Author SHA1 Message Date
Dmitry Miasnenko
466dd6b3f0
Fix 1 commit behind (#27)
* readme-fix: remove warning about cli tool. Update version in docker-compose.yml to match.

* Updated readme.md. Fully remove openapi.json. Remove version cmp beteen Cargo.toml and openapi.json. Added openapi.josn to gitignore.

* Removed openapi.json

* Update readme.md

* Update readme.md
2024-10-04 16:24:02 +03:00
Dmitry Miasnenko
782d8e4b05
Update readme. Remove openapi.json and adjust workflows. (#26)
* readme-fix: remove warning about cli tool. Update version in docker-compose.yml to match.

* Updated readme.md. Fully remove openapi.json. Remove version cmp beteen Cargo.toml and openapi.json. Added openapi.josn to gitignore.
2024-10-04 15:59:59 +03:00
Dmitry Miasnenko
7214330e53
readme-fix: remove warning about cli tool. Update version in docker-compose.yml to match. (#25) 2024-08-06 04:02:44 +03:00
7 changed files with 35 additions and 1281 deletions

View file

@ -3,7 +3,7 @@ name: "Test"
on:
push:
branches:
- "dev" # matches every branch
- "dev"
jobs:
push-to-registry:

View file

@ -46,24 +46,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: "Get version from Cargo.toml"
id: "get-cargo-version"
shell: "bash"
run: |
echo PKG_VERSION=$(awk -F ' = ' '$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' Cargo.toml) >> $GITHUB_OUTPUT
- name: Get version from openapi.json
id: get-openapi-version
run: |
echo OAPI_VERSION=$(jq -r '.info.version' openapi.json) >> $GITHUB_OUTPUT
- name: Compare versions
run: |
if [ "${{ steps.get-cargo-version.outputs.PKG_VERSION }}" != "${{ steps.get-openapi-version.outputs.OAPI_VERSION }}" ]; then
echo "Version mismatch between cargo.toml and generated OpenAPI JSON."
exit 1
else
echo "Version matches between cargo.toml and generated OpenAPI JSON."
fi
- name: Run tests (with database service)
run: cargo test --verbose -- --test-threads=1

1
.gitignore vendored
View file

@ -4,3 +4,4 @@ sites-uploads
logs
test_upload_files
.env
openapi.json

View file

@ -1,6 +1,6 @@
[package]
name = "sero"
version = "0.2.6"
version = "0.2.8"
edition = "2021"
authors = ["clowzed <clowzed.work@gmail.com>"]
description = "Muiltidomain static site hosting"
@ -11,19 +11,19 @@ license = "MIT"
[dependencies]
envy = "0.4.2"
sea-orm = { version = "0.12.3", features = [
"sqlx-postgres",
"runtime-tokio-rustls",
"macros",
"sqlx-postgres",
"runtime-tokio-rustls",
"macros",
] }
tokio = { version = "1.32.0", features = ["full"] }
tokio-postgres = "0.7.10"
tracing = { version = "0.1.37", features = ["async-await"] }
tracing-subscriber = { version = "0.3.17", features = [
"env-filter",
"fmt",
"ansi",
"std",
"json",
"env-filter",
"fmt",
"ansi",
"std",
"json",
] }
entity = { path = "entity" }
migration = { path = "migration" }
@ -41,9 +41,9 @@ mime = "0.3.17"
mime_guess = "2.0.4"
argon2 = { version = "0.5.3", features = ["std"] }
utoipa = { version = "4.2.0", features = [
"axum_extras",
"chrono",
"preserve_order",
"axum_extras",
"chrono",
"preserve_order",
] }
dotenvy = "0.15.7"
toml = "0.8.8"
@ -52,16 +52,16 @@ utoipa-rapidoc = { version = "4.0.0", features = ["axum"] }
utoipa-redoc = { version = "4.0.0", features = ["axum"] }
utoipa-swagger-ui = { version = "7.1.0", features = ["axum"] }
axum = { version = "0.7.4", features = [
"macros",
"tracing",
"json",
"multipart",
"macros",
"tracing",
"json",
"multipart",
] }
axum_typed_multipart = "0.11.0"
tower-http = { git = "https://github.com/tower-rs/tower-http.git", features = [
"cors",
"trace",
"timeout",
"cors",
"trace",
"timeout",
] }
tower = { version = "0.4.13", features = ["util"] }
hyper = "0.14.28"

View file

@ -39,15 +39,13 @@ services:
- server
server:
image: clowzed/sero
image: clowzed/sero:v0.2.7
build: .
depends_on:
database:
condition: service_healthy
volumes:
- server-files:/app/sites-uploads
ports:
- 8080:8080
environment:
- DATABASE_URL=postgresql://postgres:1234@database/sero
- PORT=8080

File diff suppressed because it is too large Load diff

View file

@ -21,31 +21,23 @@
</p>
</p>
# Warning
> [!CAUTION]
>
> **_This project was in a huge rewrite and upload tool and docs are not updated!
> THis will be fixed very soon._**
## 📖 Table Of Contents
- [Warning!](#warning)
- [📖 Table Of Contents](#-table-of-contents)
- [Docs](#docs)
- [🔧 Tools](#-tools)
- [❓ About The Project](#-about-the-project)
- [🚀 Features](#-features)
- [🔌 Built With](#-built-with)
- [📍 Roadmap](#-roadmap)
- [🧑‍🤝‍🧑 Contributing](#-contributing)
- [Creating A Pull Request](#creating-a-pull-request)
- [License](#license)
- [Authors](#authors)
- [📖 Table Of Contents](#-table-of-contents)
- [Docs](#docs)
- [🔧 Tools](#-tools)
- [❓ About The Project](#-about-the-project)
- [🚀 Features](#-features)
- [🔌 Built With](#-built-with)
- [📍 Roadmap](#-roadmap)
- [🧑‍🤝‍🧑 Contributing](#-contributing)
- [Creating A Pull Request](#creating-a-pull-request)
- [License](#license)
- [Authors](#authors)
## Docs
Read [docs here]("http://sero-docs.clowzed.ru") for fast installation.
Read [docs here]("clowzed.github.io/sero-docs/") for fast installation.
## 🔧 Tools
@ -70,7 +62,7 @@ One key feature that it is self-hosted. This gives users more flexibility and co
- Custom 503.html `new` `(on disabled site)`
- Clean urls
- Dynamic CORS Management
- `[WIP]` Server events with websocket
- `[WIP]` SSE
## 🔌 Built With