From 046a51776b02d32c4ee813bf664c053118d4d1b6 Mon Sep 17 00:00:00 2001 From: nercone-dev Date: Sun, 29 Mar 2026 00:10:48 +0900 Subject: [PATCH] -- --- nercone-webserver-autoupdator.service | 9 --------- nercone-webserver.service | 14 -------------- nercone-website-autoupdater.service | 9 +++++++++ ...ator.timer => nercone-website-autoupdater.timer | 2 +- nercone-website.service | 14 ++++++++++++++ pyproject.toml | 4 ++-- .../__init__.py | 0 .../__main__.py | 2 +- .../database.py | 0 .../error.py | 0 .../logger.py | 0 .../middleware.py | 0 .../proxy.py | 0 .../server.py | 0 start.sh | 2 +- update.sh | 10 +++++----- 16 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 nercone-webserver-autoupdator.service delete mode 100644 nercone-webserver.service create mode 100644 nercone-website-autoupdater.service rename nercone-webserver-autoupdator.timer => nercone-website-autoupdater.timer (71%) create mode 100644 nercone-website.service rename src/{nercone_webserver => nercone_website}/__init__.py (100%) rename src/{nercone_webserver => nercone_website}/__main__.py (89%) rename src/{nercone_webserver => nercone_website}/database.py (100%) rename src/{nercone_webserver => nercone_website}/error.py (100%) rename src/{nercone_webserver => nercone_website}/logger.py (100%) rename src/{nercone_webserver => nercone_website}/middleware.py (100%) rename src/{nercone_webserver => nercone_website}/proxy.py (100%) rename src/{nercone_webserver => nercone_website}/server.py (100%) diff --git a/nercone-webserver-autoupdator.service b/nercone-webserver-autoupdator.service deleted file mode 100644 index af0be21..0000000 --- a/nercone-webserver-autoupdator.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Nercone Web Server Updator - -[Service] -Type=oneshot -User=root -Group=root -WorkingDirectory=/srv/nercone-webserver -ExecStart=/usr/bin/bash /srv/nercone-webserver/update.sh diff --git a/nercone-webserver.service b/nercone-webserver.service deleted file mode 100644 index 9b12151..0000000 --- a/nercone-webserver.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Nercone Web Server -After=network.target - -[Service] -User=root -Group=root -WorkingDirectory=/srv/nercone-webserver -ExecStart=/usr/bin/bash /srv/nercone-webserver/start.sh -Restart=always -RestartSec=3 - -[Install] -WantedBy=multi-user.target diff --git a/nercone-website-autoupdater.service b/nercone-website-autoupdater.service new file mode 100644 index 0000000..d2cb154 --- /dev/null +++ b/nercone-website-autoupdater.service @@ -0,0 +1,9 @@ +[Unit] +Description=Nercone Website Updater + +[Service] +Type=oneshot +User=root +Group=root +WorkingDirectory=/srv/website +ExecStart=/usr/bin/bash /srv/website/update.sh diff --git a/nercone-webserver-autoupdator.timer b/nercone-website-autoupdater.timer similarity index 71% rename from nercone-webserver-autoupdator.timer rename to nercone-website-autoupdater.timer index 9a67c10..f2e5da6 100644 --- a/nercone-webserver-autoupdator.timer +++ b/nercone-website-autoupdater.timer @@ -1,5 +1,5 @@ [Unit] -Description=Nercone Web Server Updator +Description=Nercone Website Updater [Timer] OnCalendar=*-*-* 00:00:00 UTC diff --git a/nercone-website.service b/nercone-website.service new file mode 100644 index 0000000..d77c275 --- /dev/null +++ b/nercone-website.service @@ -0,0 +1,14 @@ +[Unit] +Description=Nercone Website +After=network.target + +[Service] +User=root +Group=root +WorkingDirectory=/srv/website +ExecStart=/usr/bin/bash /srv/website/start.sh +Restart=always +RestartSec=3 + +[Install] +WantedBy=multi-user.target diff --git a/pyproject.toml b/pyproject.toml index a0d9496..c57b998 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["uv_build>=0.9.5,<0.10.0"] build-backend = "uv_build" [project] -name = "nercone-webserver" +name = "nercone-website" version = "1.0.0" requires-python = ">=3.8" dependencies = [ @@ -16,4 +16,4 @@ dependencies = [ ] [project.scripts] -nercone-webserver = "nercone_webserver.__main__:main" +nercone-website = "nercone_website.__main__:main" diff --git a/src/nercone_webserver/__init__.py b/src/nercone_website/__init__.py similarity index 100% rename from src/nercone_webserver/__init__.py rename to src/nercone_website/__init__.py diff --git a/src/nercone_webserver/__main__.py b/src/nercone_website/__main__.py similarity index 89% rename from src/nercone_webserver/__main__.py rename to src/nercone_website/__main__.py index 7544a92..9cc9bf2 100644 --- a/src/nercone_webserver/__main__.py +++ b/src/nercone_website/__main__.py @@ -29,7 +29,7 @@ def main(): "uvicorn.access": {"handlers": ["file", "console"], "level": "INFO", "propagate": False} } } - uvicorn.run("nercone_webserver.server:app", host="0.0.0.0", port=8080, workers=1, server_header=False, log_config=log_config) + uvicorn.run("nercone_website.server:app", host="0.0.0.0", port=8080, workers=1, server_header=False, log_config=log_config) if __name__ == "__main__": main() diff --git a/src/nercone_webserver/database.py b/src/nercone_website/database.py similarity index 100% rename from src/nercone_webserver/database.py rename to src/nercone_website/database.py diff --git a/src/nercone_webserver/error.py b/src/nercone_website/error.py similarity index 100% rename from src/nercone_webserver/error.py rename to src/nercone_website/error.py diff --git a/src/nercone_webserver/logger.py b/src/nercone_website/logger.py similarity index 100% rename from src/nercone_webserver/logger.py rename to src/nercone_website/logger.py diff --git a/src/nercone_webserver/middleware.py b/src/nercone_website/middleware.py similarity index 100% rename from src/nercone_webserver/middleware.py rename to src/nercone_website/middleware.py diff --git a/src/nercone_webserver/proxy.py b/src/nercone_website/proxy.py similarity index 100% rename from src/nercone_webserver/proxy.py rename to src/nercone_website/proxy.py diff --git a/src/nercone_webserver/server.py b/src/nercone_website/server.py similarity index 100% rename from src/nercone_webserver/server.py rename to src/nercone_website/server.py diff --git a/start.sh b/start.sh index d5cb034..519c38a 100644 --- a/start.sh +++ b/start.sh @@ -1 +1 @@ -/root/.local/bin/nercone-webserver +/root/.local/bin/nercone-website diff --git a/update.sh b/update.sh index fa2cefc..6bdd004 100644 --- a/update.sh +++ b/update.sh @@ -1,7 +1,7 @@ -sudo /usr/bin/systemctl disable nercone-webserver -sudo /usr/bin/systemctl kill nercone-webserver +sudo /usr/bin/systemctl disable nercone-website +sudo /usr/bin/systemctl kill nercone-website /usr/bin/git pull -/root/.local/bin/uv tool uninstall nercone-webserver --no-cache || true +/root/.local/bin/uv tool uninstall nercone-website --no-cache || true /root/.local/bin/uv tool install . --upgrade --no-cache -sudo /usr/bin/systemctl enable nercone-webserver -sudo /usr/bin/systemctl start nercone-webserver +sudo /usr/bin/systemctl enable nercone-website +sudo /usr/bin/systemctl start nercone-website