From 2e63da4741a73b56d555f050f7481072b5f37e1f Mon Sep 17 00:00:00 2001 From: Ivan Reshetnikov Date: Sun, 15 Dec 2024 23:04:15 +0500 Subject: [PATCH] Add .editorconfig --- .editorconfig | 12 ++++++++++++ roles/archivebox/meta/argument_specs.yml | 2 +- roles/haproxy/files/haproxy.cfg | 4 ++-- roles/postgresql/tasks/main.yml | 2 +- roles/prosody/templates/prosody.cfg.lua.j2 | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..ce47e80 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +indent_style = space +indent_size = 2 + +[Makefile] +indent_style = tab diff --git a/roles/archivebox/meta/argument_specs.yml b/roles/archivebox/meta/argument_specs.yml index b71853e..073a530 100644 --- a/roles/archivebox/meta/argument_specs.yml +++ b/roles/archivebox/meta/argument_specs.yml @@ -10,7 +10,7 @@ argument_specs: type: int archive_dir: type: str - description: "Path to the archive directory" + description: "Path to the archive directory" csrf_trusted_origins: type: str required: true diff --git a/roles/haproxy/files/haproxy.cfg b/roles/haproxy/files/haproxy.cfg index ac93772..757c18f 100644 --- a/roles/haproxy/files/haproxy.cfg +++ b/roles/haproxy/files/haproxy.cfg @@ -38,10 +38,10 @@ frontend http acl path_streaming_api path_beg /api/v1/streaming use_backend mastodon_streaming if host_mastodon_tor path_streaming_api use_backend mastodon if host_mastodon_tor - + acl host_peertube_tor hdr(host) -i vcomfyooxdbibyusen75qbzaunrjykw2cxkc6txm6qykkdv4z2danpid.onion use_backend peertube if host_peertube_tor - + acl host_comfycamp_tor hdr(host) -i comfycgmgfvowbbw2ckkobuvk4cejo2e56uxrhznravxnrl7itftpkad.onion use_backend comfycamp if host_comfycamp_tor diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml index cbbbc1e..58bd70b 100644 --- a/roles/postgresql/tasks/main.yml +++ b/roles/postgresql/tasks/main.yml @@ -36,7 +36,7 @@ community.docker.docker_container_exec: container: postgresql argv: - - /bin/bash + - /bin/bash - "-c" - echo "{{ lookup('file', 'create-user.sql') }}" | psql -U postgres - name: Create roles diff --git a/roles/prosody/templates/prosody.cfg.lua.j2 b/roles/prosody/templates/prosody.cfg.lua.j2 index 9d26f10..b7eb971 100644 --- a/roles/prosody/templates/prosody.cfg.lua.j2 +++ b/roles/prosody/templates/prosody.cfg.lua.j2 @@ -85,7 +85,7 @@ http_external_url = "https://xmpp.comfycamp.space/" http_ports = { 5280 } http_interfaces = { "*" } - + https_ports = { 5281 } https_interfaces = { "*" }