From 6efa6617d389be735aeaf45ee1a60b3594f221ee Mon Sep 17 00:00:00 2001 From: Volker Date: Sat, 27 Dec 2025 17:09:31 +0100 Subject: [PATCH] fix typo: mbz is the correct string --- Dockerfile | 6 +++--- README.md | 2 +- mbz_rss_service/__init__.py | 1 + {mzb_rss_service => mbz_rss_service}/config.py | 4 ++-- {mzb_rss_service => mbz_rss_service}/main.py | 2 +- {mzb_rss_service => mbz_rss_service}/templates/base.html | 0 {mzb_rss_service => mbz_rss_service}/templates/index.html | 0 {mzb_rss_service => mbz_rss_service}/templates/opml.xml | 0 .../templates/settings.html | 0 {mzb_rss_service => mbz_rss_service}/tests/requirements.txt | 0 mzb_rss_service/__init__.py | 1 - 11 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 mbz_rss_service/__init__.py rename {mzb_rss_service => mbz_rss_service}/config.py (98%) rename {mzb_rss_service => mbz_rss_service}/main.py (99%) rename {mzb_rss_service => mbz_rss_service}/templates/base.html (100%) rename {mzb_rss_service => mbz_rss_service}/templates/index.html (100%) rename {mzb_rss_service => mbz_rss_service}/templates/opml.xml (100%) rename {mzb_rss_service => mbz_rss_service}/templates/settings.html (100%) rename {mzb_rss_service => mbz_rss_service}/tests/requirements.txt (100%) delete mode 100644 mzb_rss_service/__init__.py diff --git a/Dockerfile b/Dockerfile index 083dd85..d1bd0cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN mkdir -p /var/mbz-rss-feeder/cache /var/mbz-rss-feeder/log /var/mbz-rss-feed # Test stage FROM builder AS test -COPY mzb_rss_service/tests/requirements.txt . +COPY mbz_rss_service/tests/requirements.txt . RUN pip install --no-cache-dir -r requirements.txt COPY . . CMD ["python -m pytest"] @@ -35,8 +35,8 @@ CMD ["python -m pytest"] FROM base AS final COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages COPY --from=builder /usr/local/bin /usr/local/bin -COPY mzb_rss_service mzb_rss_service +COPY mbz_rss_service mbz_rss_service COPY VERSION . EXPOSE 8080 -CMD ["gunicorn", "--bind", "0.0.0.0:8080", "mzb_rss_service.main:app"] +CMD ["gunicorn", "--bind", "0.0.0.0:8080", "mbz_rss_service.main:app"] diff --git a/README.md b/README.md index 3ce2055..3bdc921 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ This is a local container running with data stored in ./local/testdata -p 8080:8080 -e LOG_LEVEL=debug --rm --name mbz-rss\ -v ./local/testdata/:/var/mbz-rss-feeder \ --env-file ./local/testdata/.env \ - docker.io/library/mzb-rss-feeder:latest` + docker.io/library/mbz-rss-feeder:latest` After startup the server can be accessed through http://docker-host:8080. diff --git a/mbz_rss_service/__init__.py b/mbz_rss_service/__init__.py new file mode 100644 index 0000000..eb13bc3 --- /dev/null +++ b/mbz_rss_service/__init__.py @@ -0,0 +1 @@ +# mbz_rss_service package diff --git a/mzb_rss_service/config.py b/mbz_rss_service/config.py similarity index 98% rename from mzb_rss_service/config.py rename to mbz_rss_service/config.py index 377ef52..c29cac0 100644 --- a/mzb_rss_service/config.py +++ b/mbz_rss_service/config.py @@ -11,8 +11,8 @@ logger = logging.getLogger(__name__) FEEDS_FILE_PATH = os.path.expandvars(os.environ.get('FEEDS_FILE_PATH', '/var/mbz-rss-feeder/feeds.yml')) CONFIG_FILE_PATH = os.path.expandvars(os.environ.get('CONFIG_FILE_PATH', '/var/mbz-rss-feeder/etc/mbz-rss-feeder.yml')) CACHE_DIR = os.path.expandvars(os.environ.get('CACHE_DIR', '/var/mbz-rss-feeder/cache')) -MB_APP_NAME = os.path.expandvars(os.environ.get('MB_APP_NAME', 'mzb-rss-service')) -MB_VERSION = os.path.expandvars(os.environ.get('MB_VERSION', '0.1.0')) +MB_APP_NAME = os.path.expandvars(os.environ.get('MB_APP_NAME', 'mbz-rss-service')) +MB_VERSION = os.path.expandvars(os.environ.get('MB_VERSION', '1')) MB_CONTACT = os.path.expandvars(os.environ.get('MB_CONTACT', 'someone@somewhere.com')) # file system dir check diff --git a/mzb_rss_service/main.py b/mbz_rss_service/main.py similarity index 99% rename from mzb_rss_service/main.py rename to mbz_rss_service/main.py index 3e7c3fa..dedbca8 100644 --- a/mzb_rss_service/main.py +++ b/mbz_rss_service/main.py @@ -55,7 +55,7 @@ for handler in werkzeug_logger.handlers: logger = logging.getLogger(__name__) -logger.info(f"Starting mzb-rss-service v{config.VERSION} with the following configuration:") +logger.info(f"Starting mbz-rss-service v{config.VERSION} with the following configuration:") logger.info(f" - Log Level: {log_level_str}") logger.info(f" - Log File: {log_file}") logger.info(f" - Feeds File: {config.FEEDS_FILE_PATH}") diff --git a/mzb_rss_service/templates/base.html b/mbz_rss_service/templates/base.html similarity index 100% rename from mzb_rss_service/templates/base.html rename to mbz_rss_service/templates/base.html diff --git a/mzb_rss_service/templates/index.html b/mbz_rss_service/templates/index.html similarity index 100% rename from mzb_rss_service/templates/index.html rename to mbz_rss_service/templates/index.html diff --git a/mzb_rss_service/templates/opml.xml b/mbz_rss_service/templates/opml.xml similarity index 100% rename from mzb_rss_service/templates/opml.xml rename to mbz_rss_service/templates/opml.xml diff --git a/mzb_rss_service/templates/settings.html b/mbz_rss_service/templates/settings.html similarity index 100% rename from mzb_rss_service/templates/settings.html rename to mbz_rss_service/templates/settings.html diff --git a/mzb_rss_service/tests/requirements.txt b/mbz_rss_service/tests/requirements.txt similarity index 100% rename from mzb_rss_service/tests/requirements.txt rename to mbz_rss_service/tests/requirements.txt diff --git a/mzb_rss_service/__init__.py b/mzb_rss_service/__init__.py deleted file mode 100644 index 89cb37b..0000000 --- a/mzb_rss_service/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# mzb_rss_service package