diff --git a/files/ssh/ssh_penalties.conf b/files/ssh/ssh_penalties.conf index b452eb8..53d23d5 100644 --- a/files/ssh/ssh_penalties.conf +++ b/files/ssh/ssh_penalties.conf @@ -1,2 +1,2 @@ LoginGraceTime 0 -PerSourcePenalties no \ No newline at end of file +PerSourcePenalties no diff --git a/handlers/main.yml b/handlers/main.yml index bfc8d3d..57b8ae8 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,9 +1,8 @@ - name: restart container -community.docker.docker_compose_v2: - project_src: "{{ path }}" - project_name: "{{ role_name }}" - recreate: "always" - services: ["gitea"] - state: "restarted" -when: not _gitea_already_restarted - + community.docker.docker_compose_v2: + project_src: "{{ path }}" + project_name: "{{ role_name }}" + recreate: "always" + services: ["gitea"] + state: "restarted" + when: not _gitea_already_restarted diff --git a/meta/main.yml b/meta/main.yml index 02baae4..a2c36cb 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,5 +16,5 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. -# dependencies: -# - role: base +dependencies: + - role: traefik diff --git a/tasks/main.yml b/tasks/main.yml index 516ecba..1c69128 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,14 +16,15 @@ - name: Copy ssh config copy: src: files/ssh - dest: "{{ path }}/config/gitea/ssh" + dest: "{{ path }}/config/gitea" - import_role: name: storage_mount vars: - storagebox_override: + storage_mount_override: host: "{{ gitea.networkmount.host }}" host_path: "{{ gitea.networkmount.host_path }}" + type: "{{ gitea.networkmount.type }}" args: "{{ gitea.networkmount.args }}" dest_path: "{{ gitea.data_path }}" when: gitea.networkmount.host | length > 1 diff --git a/templates/compose.yml.j2 b/templates/compose.yml.j2 index 1dfa6b1..150d8f5 100644 --- a/templates/compose.yml.j2 +++ b/templates/compose.yml.j2 @@ -29,7 +29,7 @@ services: traefik.http.routers.gitea.tls.certResolver: hetzner traefik.http.services.gitea-https.loadbalancer.server.port: 3000 - {% if gitea.enable_ssh %} + {% if gitea.enable_ssh -%} traefik.tcp.routers.gitea.rule: "HostSNI(`*`)" traefik.tcp.routers.gitea.entrypoints: public_ssh traefik.tcp.services.gitea-ssh.loadbalancer.server.port: 22