diff --git a/group_vars/server/drone b/group_vars/server/drone deleted file mode 100644 index c185bec..0000000 --- a/group_vars/server/drone +++ /dev/null @@ -1,13 +0,0 @@ -drone_gitea_server: "https://git.ducamps.win" -drone_gitea_client_id: 18ac7879-f56b-4f9f-9875-88e5c78beec0 -drone_gitea_client_secret: "{{vault_drone_gitea_client_secret}}" -drone_RPC_secret: "{{vault_drone_RPC_secret}}" -drone_server_host: "drone.ducamps.win" -drone_server_proto: https -drone_db_external: true -drone_db_host: "{{ansible_hostname}}:5432" -drone_db_password: "{{vault_SQL_drone_password}}" -drone_SQL_target_file: /mnt/diskstation/git/backup/postgres/last/{{drone_db_name}}.sql -drone_user: "{{user.name}}" -drone_port: - - "3001:80" diff --git a/group_vars/server/server b/group_vars/server/server index 7568a80..ee2b7a3 100644 --- a/group_vars/server/server +++ b/group_vars/server/server @@ -56,17 +56,6 @@ keystodeploy: user: drone-deploy sshkey: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDUaK+pQlosmopbZfucll9UdqDOTaODOBwoxRwkJEk1i drone@oscar -pihole_admin_password: "{{ vault_pihole_admin }}" -pihole_local_resolver: 192.168.1.10 -pihole_local_domain: - - domain: local.lan - resolver: "{{ pihole_local_resolver }}" - - domain: "1.168.192.in-addr.arpa" - resolver: "{{ pihole_local_resolver }}" - - domain: "consul" - resolver: "172.17.0.1#8600" - - domain: "{{ domain.name }}" - resolver: "{{ pihole_local_resolver }}" chisel_server: true chisel_server_port: 9090 chisel_server_backend: https://www.{{domain.name}} diff --git a/playbooks/server.yml b/playbooks/server.yml index 505b462..8de346d 100644 --- a/playbooks/server.yml +++ b/playbooks/server.yml @@ -11,7 +11,6 @@ - rsyncd - gandi-dyn-dns - fail2ban - - ansible-pihole - role: ansible-role-certbot become: true # need to have a external connection on 80 - role: ansible-rsync-certs @@ -22,8 +21,6 @@ become: true - role: radicale become: true - - role: ansible-drone - become: true - php - nextcloud - tt-rss diff --git a/roles/requirements.yml b/roles/requirements.yml index 5167dd2..bd25a7c 100644 --- a/roles/requirements.yml +++ b/roles/requirements.yml @@ -3,12 +3,8 @@ scm: git - src: gitea@git.ducamps.win:ansible-roles/ansible-arch-provissionning.git scm: git -- src: gitea@git.ducamps.win:ansible-roles/ansible-drone.git - scm: git - src: gitea@git.ducamps.win:ansible-roles/ansible-manager.git scm: git -- src: gitea@git.ducamps.win:ansible-roles/ansible-pihole.git - scm: git - src: gitea@git.ducamps.win:ansible-roles/ansible-role-certbot.git scm: git - src: gitea@git.ducamps.win:ansible-roles/ansible-role-chisel.git diff --git a/test-role/drone.yml b/test-role/drone.yml deleted file mode 100644 index b697ba1..0000000 --- a/test-role/drone.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- hosts: - - server - - build - become: true - roles: - - ../roles/ansible-drone