diff --git a/group_vars/server/server b/group_vars/server/server index 0e8af10..8d237c9 100644 --- a/group_vars/server/server +++ b/group_vars/server/server @@ -1,7 +1,3 @@ -syncthing_address: "0.0.0.0:8384" -syncthing_gui_user: "{{user.name}}" -syncthing_gui_password: $2a$10$nJZ8YN/1mB84Cbi79BKka.6SFMAKF.CBwyCNJDA9qUgXdkcuBilx2 - notification_mail: "{{inventory_hostname}}@{{ domain.name }}" msmtp_mailhub: smtp.{{ domain.name }} msmtp_auth_user: "{{ user.mail }}" @@ -40,7 +36,6 @@ chisel_server_auth: arch_mirror_location: "/mnt/diskstation/archMirror" system_user: - - name: nextcloud - name: drone-deploy home: /home/drone-deploy shell: /bin/bash diff --git a/group_vars/workstation b/group_vars/workstation index f9dd2f8..96c9127 100644 --- a/group_vars/workstation +++ b/group_vars/workstation @@ -54,18 +54,6 @@ systemd_mounts: - vers=3.0 - mfsymlinks automount: true - oscar_hassconfig: - share: //oscar/hassconfig - mount: /mnt/oscar/hassconfig - type: cifs - options: - - credentials=/etc/creds/.oscar_credentials - - uid=1024 - - gid=100 - - vers=3.0 - - mfsymlinks - automount: true - systemd_mounts_enabled: - diskstation_media @@ -73,8 +61,6 @@ systemd_mounts_enabled: - diskstation_ebook - diskstation_photo - diskstation_home - - oscar_hassconfig - - nextcloud credentials_files: 1: @@ -82,12 +68,6 @@ credentials_files: path: /etc/creds/.diskstation_credentials username: admin password: "{{ vault_diskstation_admin }}" - 2: - type: smb - path: /etc/creds/.oscar_credentials - username: "{{user.name}}" - password: "{{ vault_smb_user }}" - keystodeploy: - name: juicessh without password diff --git a/playbooks/server.yml b/playbooks/server.yml index 256c20f..fba3195 100644 --- a/playbooks/server.yml +++ b/playbooks/server.yml @@ -5,12 +5,9 @@ roles: - role: ansible-role-chisel become: true - - syncthing - msmtp - cronie - rsyncd - role: ansible-role-postgresql become: true - - role: ansible-role-samba - become: true - user_config diff --git a/roles/requirements.yml b/roles/requirements.yml index d5a73f6..cef4ad4 100644 --- a/roles/requirements.yml +++ b/roles/requirements.yml @@ -1,32 +1,20 @@ --- -- src: git@git.ducamps.win:2222/ansible-roles/JDownloader.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/ansible-arch-provissionning.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/ansible-manager.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/ansible-role-certbot.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/ansible-role-chisel.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/ansible-role-postgresql.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/ansible-role-samba.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/ansible-role-sssd scm: git -- src: git@git.ducamps.win:2222/ansible-roles/ansible-vaultwarden.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/ansible_bootstrap.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/autofs.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/bluetooth.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/chainetv.git - scm: git -- src: git@git.ducamps.win:2222/ansible-roles/cloud-commander.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/cronie.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/cups.git @@ -35,54 +23,28 @@ scm: git - src: git@git.ducamps.win:2222/ansible-roles/docker.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/fail2ban.git - scm: git -- src: git@git.ducamps.win:2222/ansible-roles/gandi-dyn-dns.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/grub_themes.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/hass.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/hass-client-control.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/laptop.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/mariadb.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/mpd.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/msmtp.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/nextcloud.git - scm: git -- src: git@git.ducamps.win:2222/ansible-roles/nginx.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/nvidia.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/php.git - scm: git -- src: git@git.ducamps.win:2222/ansible-roles/php7.git - scm: git -- src: git@git.ducamps.win:2222/ansible-roles/radicale.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/rsyncd.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/supysonic.git - scm: git -- src: git@git.ducamps.win:2222/ansible-roles/syncthing.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/system.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/tt-rss.git - scm: git - src: git@git.ducamps.win:2222/ansible-roles/user_config.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/virt.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/workstation.git scm: git -- src: git@git.ducamps.win:2222/ansible-roles/ansible-rsync-certs.git - scm: git - src: https://github.com/githubixx/ansible-role-wireguard.git scm: git - src: git@git.ducamps.win:2222/ansible-roles/ansible-consul.git