diff --git a/ansible/main.yml b/ansible/main.yml index 778791f..6f0572a 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -40,7 +40,6 @@ roles: - pve_docker - grafana - - gitlab - gitea - duplicati - yourls diff --git a/ansible/roles/gitlab/files/docker-compose.yml b/ansible/roles/gitlab/files/docker-compose.yml deleted file mode 100644 index 8b7b577..0000000 --- a/ansible/roles/gitlab/files/docker-compose.yml +++ /dev/null @@ -1,60 +0,0 @@ -version: "2.3" - -services: - gitlab: - image: gitlab/gitlab-ce:latest - hostname: gitlab.theorangeone.net - environment: - TZ: Europe/London - GITLAB_OMNIBUS_CONFIG: | - {% filter indent(width=8) %} - {%- include "gitlab.rb" %} - {% endfilter %} - - volumes: - - "{{ app_data_dir }}/gitlab/config:/etc/gitlab" - - "{{ app_data_dir }}/gitlab/data:/var/opt/gitlab" - - "{{ app_data_dir }}/gitlab/pages:/mnt/pages" - tmpfs: - - /var/log/gitlab - restart: unless-stopped - depends_on: - - db - - redis - ports: - - "8022:22" - labels: - - traefik.enable=true - - traefik.http.routers.gitlab.rule=Host(`git.theorangeone.net`) || Host(`git.0rng.one`) - - traefik.http.routers.gitlab.tls.certresolver=le - - traefik.http.services.gitlab-gitlab.loadbalancer.server.port=80 - - traefik.http.services.gitlab-gitlab.loadbalancer.server.scheme=http - - db: - image: postgres:12-alpine - restart: unless-stopped - volumes: - - ./postgres:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=gitlab - - POSTGRES_USER=gitlab - - POSTGRES_DB=gitlabhq_production - - redis: - image: redis:6-alpine - restart: unless-stopped - volumes: - - ./redis:/data - - lsyncd: - image: theorangeone/lsyncd:latest - environment: - - PUID=998 - - PGID=998 - restart: unless-stopped - volumes: - - "{{ app_data_dir }}/gitlab/pages:/mnt/pages:ro" - - "{{ app_data_dir }}/gitlab/lsyncd/lsyncd.lua:/config/lsyncd.lua:ro" - - "{{ app_data_dir }}/gitlab/lsyncd/id_ed25519.pub:/config/.ssh/id_ed25519.pub" - - "{{ app_data_dir }}/gitlab/lsyncd/id_ed25519:/config/.ssh/id_ed25519" - - "{{ app_data_dir }}/gitlab/lsyncd/known_hosts:/config/.ssh/known_hosts" diff --git a/ansible/roles/gitlab/files/gitlab.rb b/ansible/roles/gitlab/files/gitlab.rb deleted file mode 100644 index 08c6594..0000000 --- a/ansible/roles/gitlab/files/gitlab.rb +++ /dev/null @@ -1,36 +0,0 @@ -external_url 'https://git.theorangeone.net' -nginx['redirect_http_to_https'] = false -nginx['listen_https'] = false -nginx['listen_port'] = 80 -grafana['enable'] = false -nginx['status'] = { - 'enable' => false -} -letsencrypt['enable'] = false -puma['worker_processes'] = 4 -gitlab_rails['time_zone'] = 'Europe/London' - -alertmanager['enable'] = false -prometheus_monitoring['enable'] = false - -postgresql['enable'] = false -gitlab_rails['db_adapter'] = 'postgresql' -gitlab_rails['db_encoding'] = 'unicode' -gitlab_rails['db_host'] = 'db' -gitlab_rails['db_password'] = 'gitlab' - -redis['enable'] = false -gitlab_rails['redis_host'] = 'redis' -gitlab_rails['redis_port'] = 6379 - -gitlab_rails['gitlab_default_theme'] = 2 - -nginx['real_ip_trusted_addresses'] = ['172.80.0.0/16'] -gitlab_rails['trusted_proxies'] = ['172.80.0.0/16'] -nginx['real_ip_header'] = 'X-Forwarded-For' - -gitlab_pages['enable'] = false -pages_external_url "https://pages.theorangeone.net" -pages_nginx['enable'] = false -gitlab_rails['pages_path'] = "/mnt/pages" -gitlab_pages['external_http'] = ['0.0.0.0:8808'] diff --git a/ansible/roles/gitlab/files/lsyncd.lua b/ansible/roles/gitlab/files/lsyncd.lua deleted file mode 100644 index 3fee65e..0000000 --- a/ansible/roles/gitlab/files/lsyncd.lua +++ /dev/null @@ -1,19 +0,0 @@ -settings { - logfile = "/tmp/lsyncd.log", - statusFile = "/tmp/lsyncd.status", -} - -sync { - default.rsyncssh, - source = "/mnt/pages", - host = "user@5.39.79.153", - targetdir = "/config/pages", - delay = 10, - rsync = { - archive = true, - compress = true - }, - ssh = { - port = 8222 - } -} diff --git a/ansible/roles/gitlab/handlers/main.yml b/ansible/roles/gitlab/handlers/main.yml deleted file mode 100644 index e75ef31..0000000 --- a/ansible/roles/gitlab/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: restart gitlab - shell: - chdir: /opt/gitlab - cmd: "{{ docker_update_command }}" diff --git a/ansible/roles/gitlab/tasks/main.yml b/ansible/roles/gitlab/tasks/main.yml deleted file mode 100644 index 1a53ce9..0000000 --- a/ansible/roles/gitlab/tasks/main.yml +++ /dev/null @@ -1,26 +0,0 @@ -- name: Create install directory - file: - path: /opt/gitlab - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install compose file - template: - src: files/docker-compose.yml - dest: /opt/gitlab/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config - notify: restart gitlab - become: true - -- name: Install lsyncd config - template: - src: files/lsyncd.lua - dest: "{{ app_data_dir }}/gitlab/lsyncd/lsyncd.lua" - mode: "{{ docker_compose_file_mask }}" - owner: "998" - notify: restart gitlab - become: true diff --git a/ansible/roles/gitlab_pages/files/docker-compose.yml b/ansible/roles/gitlab_pages/files/docker-compose.yml deleted file mode 100644 index 27a90b8..0000000 --- a/ansible/roles/gitlab_pages/files/docker-compose.yml +++ /dev/null @@ -1,58 +0,0 @@ -version: "2.3" - -services: - gitlab-pages: - image: gitlab/gitlab-ce:latest - hostname: pages.theorangeone.net - environment: - TZ: Europe/London - GITLAB_OMNIBUS_CONFIG: | - {% filter indent(width=8) %} - {%- include "gitlab.rb" %} - {% endfilter %} - - volumes: - - ./config:/etc/gitlab - - ./data:/var/opt/gitlab - - ./pages:/var/opt/gitlab/gitlab-rails/shared/pages - tmpfs: - - /var/log/gitlab - healthcheck: - disable: true - restart: unless-stopped - labels: - - traefik.enable=true - - traefik.http.routers.gitlab-pages.middlewares=compress@file - - - traefik.http.routers.gitlab-pages.rule=HostRegexp(`{subdomain:[a-z]+}.pages.theorangeone.net`) - - traefik.http.routers.gitlab-pages.tls.certresolver=le - - traefik.http.routers.gitlab-pages.tls.domains[0].main=pages.theorangeone.net - - traefik.http.routers.gitlab-pages.tls.domains[0].sans=*.pages.theorangeone.net - - traefik.http.services.gitlab-pages-gitlab-pages.loadbalancer.server.port=8080 - - traefik.http.services.gitlab-pages-gitlab-pages.loadbalancer.server.scheme=http - - - traefik.http.routers.gitlab-pages-notes.rule=Host(`notes.theorangeone.net`) - - traefik.http.routers.gitlab-pages-notes.tls.certresolver=le - - traefik.http.routers.gitlab-pages-notes.service=gitlab-pages-gitlab-pages - - - traefik.http.routers.gitlab-pages-website.rule=Host(`theorangeone.net`) || Host(`www.theorangeone.net`) - - traefik.http.routers.gitlab-pages-website.tls.certresolver=le - - traefik.http.routers.gitlab-pages-website.service=gitlab-pages-gitlab-pages - - ssh-server: - image: linuxserver/openssh-server:latest - environment: - - TZ=Europe/London - - USER_NAME=user - - PUBLIC_KEY_FILE=/id_ed25519.pub - - PUID=998 - - PGID=998 - volumes: - - ./ssh:/config - - ./pages:/config/pages - - ./id_ed25519.pub:/id_ed25519.pub:ro - - ./install-rsync.sh:/config/custom-cont-init.d/install-rsync.sh:ro - tmpfs: - - /config/logs - ports: - - 8222:2222 diff --git a/ansible/roles/gitlab_pages/files/gitlab.rb b/ansible/roles/gitlab_pages/files/gitlab.rb deleted file mode 100644 index c4a11dd..0000000 --- a/ansible/roles/gitlab_pages/files/gitlab.rb +++ /dev/null @@ -1,20 +0,0 @@ -external_url 'https://git.theorangeone.net' - -grafana['enable'] = false -postgresql['enable'] = false -redis['enable'] = false -prometheus['enable'] = false -puma['enable'] = false -sidekiq['enable'] = false -gitlab_workhorse['enable'] = false -gitaly['enable'] = false -alertmanager['enable'] = false -node_exporter['enable'] = false -gitlab_rails['auto_migrate'] = false -nginx['enabled'] = false -logrotate['enable'] = false - -pages_external_url "https://pages.theorangeone.net" -pages_nginx['enable'] = false -gitlab_pages['external_http'] = ['0.0.0.0:8080'] -gitlab_pages['inplace_chroot'] = true diff --git a/ansible/roles/gitlab_pages/files/install-rsync.sh b/ansible/roles/gitlab_pages/files/install-rsync.sh deleted file mode 100644 index 0a6a71e..0000000 --- a/ansible/roles/gitlab_pages/files/install-rsync.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo "**** installing rsync ****" -apk add --no-cache rsync diff --git a/ansible/roles/gitlab_pages/handlers/main.yml b/ansible/roles/gitlab_pages/handlers/main.yml deleted file mode 100644 index 50cfe0f..0000000 --- a/ansible/roles/gitlab_pages/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: restart gitlab-pages - shell: - chdir: /opt/gitlab-pages - cmd: "{{ docker_update_command }}" diff --git a/ansible/roles/gitlab_pages/tasks/main.yml b/ansible/roles/gitlab_pages/tasks/main.yml deleted file mode 100644 index 2341bbb..0000000 --- a/ansible/roles/gitlab_pages/tasks/main.yml +++ /dev/null @@ -1,26 +0,0 @@ -- name: Create install directory - file: - path: /opt/gitlab-pages - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install compose file - template: - src: files/docker-compose.yml - dest: /opt/gitlab-pages/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config - notify: restart gitlab-pages - become: true - -- name: Install rsync installer - template: - src: files/install-rsync.sh - dest: /opt/gitlab-pages/install-rsync.sh - mode: 0755 - owner: "998" - notify: restart gitlab-pages - become: true