diff --git a/ansible/roles/docker/files/gitea/app.ini b/ansible/roles/docker/files/gitea/app.ini index 2ba2b82..74b768d 100644 --- a/ansible/roles/docker/files/gitea/app.ini +++ b/ansible/roles/docker/files/gitea/app.ini @@ -15,7 +15,7 @@ TEMP_PATH = /data/gitea/uploads APP_DATA_PATH = /data/gitea SSH_DOMAIN = git.0rng.one HTTP_PORT = 3000 -ROOT_URL = https://git.0rng.one/gitea/ +ROOT_URL = https://git.0rng.one/ DISABLE_SSH = false SSH_PORT = 22 SSH_LISTEN_PORT = 3022 diff --git a/ansible/roles/docker/files/gitea/cgitrc b/ansible/roles/docker/files/gitea/cgitrc deleted file mode 100644 index 43278c2..0000000 --- a/ansible/roles/docker/files/gitea/cgitrc +++ /dev/null @@ -1,11 +0,0 @@ -# -# cgit config -# - -css=/cgit.css -logo=/cgit.png -source-filter=/bin/syntax-highlighting.sh -virtual-root=/ -mimetype-file=/etc/mime.types -robots=noindex, nofollow -include=/config/repos.txt diff --git a/ansible/roles/docker/files/gitea/docker-compose.yml b/ansible/roles/docker/files/gitea/docker-compose.yml index 3a5542e..2f58382 100644 --- a/ansible/roles/docker/files/gitea/docker-compose.yml +++ b/ansible/roles/docker/files/gitea/docker-compose.yml @@ -10,12 +10,10 @@ services: - USER_GID={{ docker_user.id }} labels: - "traefik.enable=true" - - "traefik.http.routers.gitea.rule=(Host(`git.theorangeone.net`) || Host(`git.0rng.one`)) && PathPrefix(`/gitea`)" + - "traefik.http.routers.gitea.rule=(Host(`git.theorangeone.net`) || Host(`git.0rng.one`))" - "traefik.http.routers.gitea.tls=true" - "traefik.http.routers.gitea.tls.certresolver=le" - "traefik.http.services.gitea-gitea.loadbalancer.server.port=3000" - - "traefik.http.middlewares.gitea-strip.stripprefix.prefixes=/gitea" - - "traefik.http.routers.gitea.middlewares=gitea-strip" ports: - "{{ wireguard.clients.intersect.ip }}:3022:3022" volumes: @@ -47,30 +45,3 @@ services: - POSTGRES_DB=gitea - BACKUP_KEEP_MONTHS=1 - BACKUP_KEEP_WEEKS=1 - - cgit: - image: theorangeone/docker-cgit:latest - container_name: cgit - restart: unless-stopped - environment: - - USER_UID={{ docker_user.id }} - - USER_GID={{ docker_user.id }} - volumes: - - ./repos:/data/git:ro - - ./cgit/cgitrc:/config/cgitrc:ro - - ./cgit/repos.txt:/config/repos.txt:ro - labels: - - "traefik.enable=true" - - "traefik.http.routers.cgit.rule=Host(`git.theorangeone.net`) || Host(`git.0rng.one`)" - - "traefik.http.routers.cgit.tls=true" - - "traefik.http.routers.cgit.tls.certresolver=le" - - gitea-cgit-adapter: - image: theorangeone/gitea-cgit-adapter:latest - restart: unless-stopped - command: /app/gitea-cgit-adapter /etc/gitea.ini /etc/cgit-repos.txt --interval 600 - depends_on: - - gitea - volumes: - - ./gitea/gitea/conf/app.ini:/etc/gitea.ini:ro - - ./cgit/repos.txt:/etc/cgit-repos.txt diff --git a/ansible/roles/docker/tasks/gitea.yml b/ansible/roles/docker/tasks/gitea.yml index 12cadd0..ee13f25 100644 --- a/ansible/roles/docker/tasks/gitea.yml +++ b/ansible/roles/docker/tasks/gitea.yml @@ -16,13 +16,6 @@ mode: "{{ docker_compose_directory_mask }}" become: true -- name: Create cgit config directory - file: - path: /opt/gitea/cgit - state: directory - mode: "{{ docker_compose_directory_mask }}" - become: true - - name: Install gitea compose file template: src: files/gitea/docker-compose.yml @@ -42,21 +35,6 @@ register: gitea_config_file become: true -- name: Install cgit config file - template: - src: files/gitea/cgitrc - dest: /opt/gitea/cgit/cgitrc - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - register: cgit_config_file - become: true - -- name: Touch public repos file - file: - path: /opt/gitea/cgit/repos.txt - state: file - become: true - - name: Cycle gitea container docker_compose: project_src: /opt/gitea @@ -64,7 +42,7 @@ remove_orphans: true remove_volumes: true state: "{{ item }}" - when: compose_file.changed or gitea_config_file.changed or cgit_config_file.changed + when: compose_file.changed or gitea_config_file.changed loop: - absent - present