diff --git a/package/etc/ahriman.ini.d/logging.ini b/package/etc/ahriman.ini.d/logging.ini index e2e9a495..b4c9fa13 100644 --- a/package/etc/ahriman.ini.d/logging.ini +++ b/package/etc/ahriman.ini.d/logging.ini @@ -2,7 +2,7 @@ keys = root,builder,build_details,http [handlers] -keys = console_handler,build_file_handler,file_handler,http_handler,syslog_handler +keys = console_handler,syslog_handler [formatters] keys = generic_format,syslog_format @@ -13,24 +13,6 @@ level = DEBUG formatter = generic_format args = (sys.stderr,) -[handler_file_handler] -class = logging.handlers.RotatingFileHandler -level = DEBUG -formatter = generic_format -args = ("/var/log/ahriman/ahriman.log", "a", 20971520, 20) - -[handler_build_file_handler] -class = logging.handlers.RotatingFileHandler -level = DEBUG -formatter = generic_format -args = ("/var/log/ahriman/build.log", "a", 20971520, 20) - -[handler_http_handler] -class = logging.handlers.RotatingFileHandler -level = DEBUG -formatter = generic_format -args = ("/var/log/ahriman/http.log", "a", 20971520, 20) - [handler_syslog_handler] class = logging.handlers.SysLogHandler level = DEBUG diff --git a/package/share/ahriman/build-status.jinja2 b/package/share/ahriman/build-status.jinja2 index 4d4e3f45..35520e01 100644 --- a/package/share/ahriman/build-status.jinja2 +++ b/package/share/ahriman/build-status.jinja2 @@ -5,11 +5,7 @@ - - - - - {% include "style.jinja2" %} + {% include "utils/style.jinja2" %} @@ -27,35 +23,45 @@
- - - + {% if not auth_enabled or auth_username is not none %} + + + + {% endif %}
- - - + + + + @@ -67,8 +73,10 @@ - + + + @@ -103,18 +111,14 @@ {% if auth_enabled %} - {% include "login-modal.jinja2" %} + {% include "build-status/login-modal.jinja2" %} {% endif %} - {% include "package-actions-modals.jinja2" %} + {% include "build-status/package-actions-modals.jinja2" %} - - - - - + {% include "utils/bootstrap-scripts.jinja2" %} - {% include "package-actions-script.jinja2" %} + {% include "build-status/package-actions-script.jinja2" %} diff --git a/package/share/ahriman/login-modal.jinja2 b/package/share/ahriman/build-status/login-modal.jinja2 similarity index 100% rename from package/share/ahriman/login-modal.jinja2 rename to package/share/ahriman/build-status/login-modal.jinja2 diff --git a/package/share/ahriman/package-actions-modals.jinja2 b/package/share/ahriman/build-status/package-actions-modals.jinja2 similarity index 100% rename from package/share/ahriman/package-actions-modals.jinja2 rename to package/share/ahriman/build-status/package-actions-modals.jinja2 diff --git a/package/share/ahriman/package-actions-script.jinja2 b/package/share/ahriman/build-status/package-actions-script.jinja2 similarity index 100% rename from package/share/ahriman/package-actions-script.jinja2 rename to package/share/ahriman/build-status/package-actions-script.jinja2 diff --git a/package/share/ahriman/email-index.jinja2 b/package/share/ahriman/email-index.jinja2 index 87d3fd3e..1fc99d32 100644 --- a/package/share/ahriman/email-index.jinja2 +++ b/package/share/ahriman/email-index.jinja2 @@ -6,15 +6,13 @@ - - - {% include "style.jinja2" %} + {% include "utils/style.jinja2" %}
-
package basepackagespackage base versionpackagesgroupslicenses last update status
{{ package.base }}{{ package.packages|join("
"|safe) }}		 {{ package.version }}{{ package.packages|join("
"|safe) }}		{{ package.groups|join("
"|safe) }}		{{ package.licenses|join("
"|safe) }}		 {{ package.timestamp }} {{ package.status }}
+
diff --git a/package/share/ahriman/repo-index.jinja2 b/package/share/ahriman/repo-index.jinja2 index ecd25f88..c1a85691 100644 --- a/package/share/ahriman/repo-index.jinja2 +++ b/package/share/ahriman/repo-index.jinja2 @@ -5,11 +5,7 @@ - - - - - {% include "style.jinja2" %} + {% include "utils/style.jinja2" %} @@ -30,20 +26,32 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
-
package
- + + + + + + + @@ -55,6 +63,12 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa + + + + + + @@ -74,11 +88,7 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa - - - - - + {% include "utils/bootstrap-scripts.jinja2" %} diff --git a/package/share/ahriman/style.jinja2 b/package/share/ahriman/style.jinja2 deleted file mode 100644 index 6f29e9e9..00000000 --- a/package/share/ahriman/style.jinja2 +++ /dev/null @@ -1 +0,0 @@ - diff --git a/package/share/ahriman/utils/bootstrap-scripts.jinja2 b/package/share/ahriman/utils/bootstrap-scripts.jinja2 new file mode 100644 index 00000000..59991111 --- /dev/null +++ b/package/share/ahriman/utils/bootstrap-scripts.jinja2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/package/share/ahriman/utils/style.jinja2 b/package/share/ahriman/utils/style.jinja2 new file mode 100644 index 00000000..b2ccd979 --- /dev/null +++ b/package/share/ahriman/utils/style.jinja2 @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/setup.py b/setup.py index 430ea257..a1ec1fef 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,15 @@ setup( "package/share/ahriman/build-status.jinja2", "package/share/ahriman/email-index.jinja2", "package/share/ahriman/repo-index.jinja2", - "package/share/ahriman/style.jinja2", + ]), + ("share/ahriman/build-status", [ + "package/share/ahriman/build-status/login-modal.jinja2", + "package/share/ahriman/build-status/package-actions-modals.jinja2", + "package/share/ahriman/build-status/package-actions-script.jinja2", + ]), + ("share/ahriman/utils", [ + "package/share/ahriman/utils/bootstrap-scripts.jinja2", + "package/share/ahriman/utils/style.jinja2", ]), ], diff --git a/tests/ahriman/core/upload/test_s3.py b/tests/ahriman/core/upload/test_s3.py index 9f2cfd2e..c8b3af81 100644 --- a/tests/ahriman/core/upload/test_s3.py +++ b/tests/ahriman/core/upload/test_s3.py @@ -59,13 +59,14 @@ def test_get_local_files(s3: S3, resource_path_root: Path) -> None: Path("models/package_ahriman_srcinfo"), Path("models/package_tpacpi-bat-git_srcinfo"), Path("models/package_yay_srcinfo"), + Path("web/templates/build-status/login-modal.jinja2"), + Path("web/templates/build-status/package-actions-modals.jinja2"), + Path("web/templates/build-status/package-actions-script.jinja2"), + Path("web/templates/utils/bootstrap-scripts.jinja2"), + Path("web/templates/utils/style.jinja2"), Path("web/templates/build-status.jinja2"), Path("web/templates/email-index.jinja2"), - Path("web/templates/login-modal.jinja2"), - Path("web/templates/package-actions-modals.jinja2"), - Path("web/templates/package-actions-script.jinja2"), Path("web/templates/repo-index.jinja2"), - Path("web/templates/style.jinja2"), ]) local_files = list(sorted(s3.get_local_files(resource_path_root).keys()))
packagepackage versionarchitecturedescriptionupstream urllicensesgroupsdepends archive size installed size build date
{{ package.name }} {{ package.version }}{{ package.architecture }}{{ package.description }}{{ package.url }}{{ package.licenses|join("
"|safe) }}		{{ package.groups|join("
"|safe) }}		{{ package.depends|join("
"|safe) }}		 {{ package.archive_size }} {{ package.installed_size }} {{ package.build_date }}