diff --git a/playbooks/vars/desultd-gitea.yml b/playbooks/vars/desultd-gitea.yml deleted file mode 100644 index 0fc170b..0000000 --- a/playbooks/vars/desultd-gitea.yml +++ /dev/null @@ -1,19 +0,0 @@ -# vim:ft=ansible: -# Look and feel -gitea_app_name: "Git Desu" -# Core config -gitea_db_type: postgres -gitea_db_host: 192.168.164.156:5432 -gitea_db_name: gitea-desultd -gitea_db_user: gitea-desultd -gitea_db_password: "{{ secret_gitea_db_pass }}" -gitea_http_domain: git.desu.ltd -gitea_oauth2_enabled: no -gitea_repository_root: /srv/desu.ltd/git -gitea_require_signin: no -gitea_root_url: https://git.desu.ltd -gitea_shell: "/bin/bash" -gitea_ssh_domain: git.desu.ltd -gitea_ssh_port: 22 -gitea_start_ssh: no -gitea_user: git diff --git a/playbooks/web.yml b/playbooks/web.yml index e43271d..955e2ac 100755 --- a/playbooks/web.yml +++ b/playbooks/web.yml @@ -38,6 +38,30 @@ volumes: - /data/9iron/files:/var/www/html/files tags: [ docker, 9iron ] + - name: docker deploy gitea + docker_container: + name: gitea + state: started + image: gitea/gitea:1 + restart_policy: unless-stopped + pull: yes + env: + USER_UID: "1002" + USER_GID: "1002" + GITEA__database_DB_TYPE: postgres + GITEA__database_HOST: 192.168.164.156:5432 + GITEA__database_NAME: gitea-desultd + GITEA__database_USER: gitea-desultd + GITEA__database_PASSWD: "{{ secret_gitea_db_pass }}" + ports: + - 3000:3000 + - 127.0.0.1:2222:22 + volumes: + - /data/gitea/data:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /var/lib/gitea/.ssh:/data/git/.ssh + tags: [ docker, gitea ] - name: docker deploy gulagbot docker_container: name: gulagbot @@ -63,13 +87,13 @@ - /srv/desu.ltd backup_s3backup_exclude_list_extra: - /var/lib/gitea/log + - /data/gitea/data/gitea/log tags: [ backup ] - role: motd vars: motd_watch_services_extra: - apache2 - docker - - gitea - php7.4-fpm tags: [ motd ] - role: docker @@ -86,12 +110,12 @@ - repo: https://git.9iron.club/KidiroInfiniti/OTW_Site dest: /var/www/www.otwstudios.org - repo: https://git.desu.ltd/salt/gitea-custom - dest: /usr/local/bin/custom + dest: /data/gitea/data/gitea/custom tags: [ web, git ] - role: nextcloud tags: [ web, nextcloud ] - - role: gitea - tags: [ web, gitea ] +# - role: gitea +# tags: [ web, gitea ] - hosts: web1.9iron.club tasks: - name: configure nextcloud cronjob