diff --git a/docker-compose.yaml b/docker-compose.yaml index 6bb693c..643b9a8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,10 @@ services: web_ui: - image: ultradesu/outfleet:v2 + #image: ultradesu/outfleet:v2 + image: outfleet:local container_name: outfleet-web +# volumes: +# - .:/app build: context: . ports: @@ -10,6 +13,7 @@ services: - POSTGRES_HOST=postgres - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres + - EXTERNAL_ADDRESS=http://127.0.0.1:8000 - CELERY_BROKER_URL=redis://redis:6379/0 depends_on: postgres: @@ -25,6 +29,8 @@ services: worker: image: ultradesu/outfleet:v2 container_name: outfleet-worker +# volumes: +# - .:/app build: context: . environment: @@ -42,6 +48,8 @@ services: beat: image: ultradesu/outfleet:v2 container_name: outfleet-beat +# volumes: +# - .:/app build: context: . environment: @@ -66,6 +74,8 @@ services: POSTGRES_DB: outfleet ports: - "5432:5432" + volumes: + - postgres_data:/var/lib/postgresql/data healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 10s diff --git a/vpn/admin.py b/vpn/admin.py index 744e772..f8a50bc 100644 --- a/vpn/admin.py +++ b/vpn/admin.py @@ -139,13 +139,13 @@ class ACLLinkInline(admin.TabularInline): help_text = 'Add or change ACL links' verbose_name = 'Dynamic link' verbose_name_plural = 'Dynamic links' - fields = ('link',) + fields = ('link', 'comment') @admin.register(ACL) class ACLAdmin(admin.ModelAdmin): list_display = ('user', 'server', 'server_type', 'display_links', 'created_at') - list_editable = ('server', ) + #list_editable = ('server', ) list_filter = (UserNameFilter, 'server__server_type', ServerNameFilter) search_fields = ('user__name', 'server__name', 'server__comment', 'user__comment', 'links__link') readonly_fields = ('user_info',) @@ -168,6 +168,6 @@ class ACLAdmin(admin.ModelAdmin): @admin.display(description='Dynamic Config Links') def display_links(self, obj): links = obj.links.all() - formatted_links = [f"{EXTERNAL_ADDRESS}/ss/{link.link}" for link in links] + formatted_links = [f"{EXTERNAL_ADDRESS}/ss/{link.link}#{link.acl.server.name}" for link in links] return mark_safe('
'.join(formatted_links)) diff --git a/vpn/models.py b/vpn/models.py index d400587..9d7439e 100644 --- a/vpn/models.py +++ b/vpn/models.py @@ -67,6 +67,7 @@ def acl_deleted(sender, instance, **kwargs): class ACLLink(models.Model): acl = models.ForeignKey(ACL, related_name='links', on_delete=models.CASCADE) + comment = models.TextField(default="", blank=True, help_text="ACL link comment, device name, etc...") link = models.CharField(max_length=1024, default="", unique=True, blank=True, null=True, verbose_name="Access link", help_text="Access link to get dynamic configuration") def save(self, *args, **kwargs):