diff --git a/README.md b/README.md index 3722f82..f5b384d 100644 --- a/README.md +++ b/README.md @@ -78,14 +78,6 @@ Create a superuser account ``` -### Repository Quota Updates - -The repository quotas in the UI are updated after each backup. -To update the quota during an operation the `update_used_quota` management command can be executed on a regular basis. - -There are example configs for systemd-timers in `contrib/communitybackup-quota-update.service` and `contrib/communitybackup-quota-update.timer`. Adjust the paths and the timers to your needs. - - ## Custom pages Some pages are specific to your installation. E.g. an imprint. @@ -142,37 +134,3 @@ Django debug setting. ### MARKDOWN_PAGE_DIR `MARKDOWN_PAGE_DIR` is the directory where customized markdown files are put. This directory is required. - -### BACKUP_MANAGE_PY - -`BACKUP_MANAGE_PY` is the command to run the `manage.py` file, including e.g. a Python interpreter, venv, etc. This must be a `pathlib.Path` - -### ADDITIONAL_FOOTER_NAV_ITEMS - -`ADDITIONAL_FOOTER_NAV_ITEMS` allows you to add additional links to the footer. This is a `list[str]`. Each item gets rendered as is into a `
  • `. So usually you want to continue the proper Bootstrap styling in the lst. E.g.: - -```python -ADDITIONAL_FOOTER_NAV_ITEMS = [""" str: - return f"ssh://{settings.BACKUP_USER}@{settings.BACKUP_REPO_HOST}/./{self.user.pk}/{self.pk}" + return f"{settings.BACKUP_USER}@{settings.BACKUP_REPO_HOST}:{self.user.pk}/{self.pk}" - def save(self, *args, **kwargs): + def save(self): - super().save(*args, **kwargs) + super().save() update_user.enqueue() def delete(self): @@ -60,60 +56,6 @@ class BorgRepository(models.Model): super().delete() update_user.enqueue() - @property - def key_type(self) -> str: - return self.key.split(" ", 1)[0].strip() - - @property - def key_value(self) -> str: - return self.key.split(" ", 2)[1].strip() - - @property - def key_comment(self) -> str | None: - splits = self.key.split(" ", 2) - if len(splits) == 3: - return splits[2].strip() - return None - - def truncated_key(self, length: int = 60): - """ - Returns a truncated version of the key for display purposes. - The Key type and the comment are retained as much as possible. - """ - - # check how long the truncated part of the key may be at most. - max_len = length - len(self.key_type) - 1 - if self.key_comment: - max_len = max_len - len(self.key_comment) - 1 - - if len(self.key_value) > max_len: - max_len -= 1 # remove one character if we add an ellipsis - trunc_key = self.key_value[:max_len] + "…" - else: - trunc_key = self.key_value - - output = f"{self.key_type} {trunc_key}" - - if self.key_comment: - output += f" {self.key_comment}" - - return output - - def refresh_quota(self): - hints_files = self.path.glob("hints.*") - - try: - hint = next(hints_files) - data = hint.open(mode="rb").read() - - unpacked = msgpack.unpackb(data, strict_map_key=False, raw=True) - quota_used = unpacked[b"storage_quota_use"] - - self.used_quota = int(quota_used / 10**9) - except StopIteration: - # No hints file found, therefore the repo is probably not initialized - self.used_quota = -1 - class Voucher(models.Model): used = models.BooleanField(default=False) diff --git a/community_backup/webui/templates/base.html b/community_backup/webui/templates/base.html index b418e2b..f030569 100644 --- a/community_backup/webui/templates/base.html +++ b/community_backup/webui/templates/base.html @@ -67,17 +67,6 @@
    • - {% if ADDITIONAL_FOOTER_NAV_ITEMS %} -
    - -
    - {% endif %} diff --git a/community_backup/webui/templates/borg_list.html b/community_backup/webui/templates/borg_list.html index 2f6e7c7..b193fcd 100644 --- a/community_backup/webui/templates/borg_list.html +++ b/community_backup/webui/templates/borg_list.html @@ -18,16 +18,14 @@ Name Key Repo-URL - Quota (used/total) {% for repo in object_list %} {{ repo.name }} - {{ repo.truncated_key }} - {{ repo.repo_url }} - {% if repo.used_quota < 0 %}not initialized{% else %}{{ repo.used_quota }}/{{ repo.quota }} GB{% endif %} + {{ repo.key | truncatechars:40 }} + {{ repo.repo_url}}     Edit Delete @@ -35,21 +33,6 @@ -{% if BORG_SERVER_PUBKEYS %} -
    -
    -

    Borg Server Public Keys

    -
    - -
    -{% endif %} diff --git a/community_backup/webui/templates/landing.html b/community_backup/webui/templates/landing.html index a9960f9..b7a8141 100644 --- a/community_backup/webui/templates/landing.html +++ b/community_backup/webui/templates/landing.html @@ -6,7 +6,7 @@ -

    This is a service offering space for backups free of charge. This is a hobby project. It comes with no guarantees for anything, especially availability of the service. This service is in a testing phase at the moment. It might be unavailable at times and features might change quickly.

    +

    This is a service offering space for backups free of charge. This is a hobby project. It comes with no garantees for anything, especially availability of the service. This service is in a testing phase at the moment. It might be unavailable at times and features might change quickly.

    Currently this service offers only backups via Borg Backup.

    To access this service you need an account. To register for an account you need a voucher. Vouchers are required to control the amount of users, so that there is enough space available for everyone.

     diff --git a/pyproject.toml b/pyproject.toml index 2412b09..526d5d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "community_backup" -version = "0.12" +version = "0.6" description = "Add your description here" readme = "README.md" requires-python = ">=3.13" @@ -10,5 +10,4 @@ dependencies = [ "django-crispy-forms>=2.6", "gunicorn>=25.3.0", "markdown2>=2.5.5", - "msgpack>=1.1.2", ]