Merge branch 'master' of git.ducamps.win:vincent/ansible

global.yml

@@ -3,4 +3,3 @@
   roles:
     - system
     - autofs
-    - syncthing

group_vars/all/all

@@ -5,4 +5,6 @@ user:
     mail: vincent@ducamps.win
 
 domain:
-    name: ducamps.win
+    name: ducamps.win
+
+hass_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDfVei9iC/Ra5qmSZcLu8z2CTaXCmfn4JSS4o3eu0HhykdYGSqhBTcUDD3/FhcTPQJVFsu1P4Gwqq1dCE+EvaZZRQaMUqVKUpOliThSG6etbImkvqLQQsC1qt+/NqSvfzu2+28A6+YspzuxsViGo7e3Gg9MdwV3LMGh0mcOr/uXb/HIk18sJg5yQpwMfYTj0Wda90nyegcN3F2iZMeauh/aaFJzWcHNakAAewceDYOErU07NhlZgVA2C8HgkJ8HL7AqIVqt9VOx3xLp91DbKTNXSxvyM0X4NQP24P7ZFxAOk/j0AX3hAWhaNmievCHyBWvQve1VshZXFwEIiuHm8q4GSCxK2r0oQudKdtIuQMfuUALigdiSxo522oEiML/2kSk17WsxZwh7SxfD0DKa82fy9iAwcAluWLwJ+yN3nGnDFF/tHYaamSiowpmTTmQ9ycyIPWPLVZclt3BlEt9WH/FPOdzAyY7YLzW9X6jhsU3QwViyaTRGqAdqzUAiflKCMsNzb5kq0oYsDFC+/eqp1USlgTZDhoKtTKRGEjW2KuUlDsXGBeB6w1D8XZxXJXAaHuMh4oMUgLswjLUdTH3oLnnAvfOrl8O66kTkmcQ8i/kr1wDODMy/oNUzs8q4DeRuhD5dpUiTUGYDTWPYj6m6U/GAEHvN/2YEqSgfVff1iQ4VBw==

group_vars/server

@@ -45,7 +45,7 @@ systemd_mounts:
             - " "
         automount: true
     diskstation_media:
-        share: diskstation.ducamps.win:/volume2/media
+        share: diskstation.ducamps.win:/volume1/media
         mount: /mnt/diskstation/media
         type: nfs
         options:
@@ -376,6 +376,8 @@ php_extention_enable:
     - soap
     - intl
     - gd #need for nextcloud
+    - imagick #need for nextcloud
+    - opcache  #need for nextcloud
 
 mysql_root_password: "{{ vault_mysql_root }}"
 mysql_root_password_update: true

group_vars/workstation

@@ -85,4 +85,5 @@ keystodeploy:
     - name: juicessh without password
       sshkey: ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBGHcHCTrzRuxEhsRdV+Q2Yr+nQNNuYKoNLmxW3IlVJtCIuaCY5prX1UuE8+nNWhbNVSagBCQwmubxLUV5ORf+tCBHeMyDPo7oetu3Wy5JaUwfGcuw3yGN94Qj3LqPUkdiw== juicewithoutpassword
     - name: fixe-pc new
-      sshkey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDBrP9akjyailPU9tUMvKrtDsqjI191W1L95u3OFjBqqapXgbDVx1FVtSlIIKcCHZyTII1zgC7woZmNRpmaIJRh6N+VIuRrRs29xx2GUVc4pxflUwwIAK36hgZS3nqmA2biacmPR9HogZLZMcPtZdLhWGlLuUv1cWqbqW7UcDa0lbubCo2v4OQMx/zt37voKAZSkkbH9mVszH6eKxNFy1KXbLYhwXiKfYBnAHbivhiSkZUGV6D4HNj8Jx6IY1YF3bfwMXmt841Q/7OY+t3RTIS8ewvSF+jpQ7GKHBEsZTZUGwIoSyZFFvCgKQVOJu/ZJJS4HNkluilir9Sxtx2LRgy+HHQ251trnsVsJp3ts4uTiMkKJQy1PXy1ZvQXYkip9Af3vlXUMmTyVj8cv+No07G1rZ1pZ3wXKX4RkTsoep5GsYlhyUd7GzsAQQiX9YhYyWDQ6NHBYAGAWbw2BLNxltWa4AyWOa1C8v+1+mRwdvpdMY7powJNCXQaIJmiOZiI/Us= vincent@fixe-pc-2020-03-01
+      sshkey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDBrP9akjyailPU9tUMvKrtDsqjI191W1L95u3OFjBqqapXgbDVx1FVtSlIIKcCHZyTII1zgC7woZmNRpmaIJRh6N+VIuRrRs29xx2GUVc4pxflUwwIAK36hgZS3nqmA2biacmPR9HogZLZMcPtZdLhWGlLuUv1cWqbqW7UcDa0lbubCo2v4OQMx/zt37voKAZSkkbH9mVszH6eKxNFy1KXbLYhwXiKfYBnAHbivhiSkZUGV6D4HNj8Jx6IY1YF3bfwMXmt841Q/7OY+t3RTIS8ewvSF+jpQ7GKHBEsZTZUGwIoSyZFFvCgKQVOJu/ZJJS4HNkluilir9Sxtx2LRgy+HHQ251trnsVsJp3ts4uTiMkKJQy1PXy1ZvQXYkip9Af3vlXUMmTyVj8cv+No07G1rZ1pZ3wXKX4RkTsoep5GsYlhyUd7GzsAQQiX9YhYyWDQ6NHBYAGAWbw2BLNxltWa4AyWOa1C8v+1+mRwdvpdMY7powJNCXQaIJmiOZiI/Us= vincent@fixe-pc-2020-03-01
+

hass.yml

@@ -0,0 +1,4 @@
+- hosts: server
+  roles:
+    - {role: mariadb, become: yes }
+    - hass

host_vars/VMAS-HML

@@ -1,9 +1,7 @@
 ##ansible_python_interpreter: /usr/bin/python2
 ##music_directory: '/mnt/diskstation/music'
-system_upgrade: true
 ttrss_url_path: http://vmas-hml/tt-rss/
-
-system_upgrade: false
+system_upgrade: true
 
 gitea_http_domain: vmas-hml
 gitea_root_url: http://vmas-hml:3000

music-player.yml

@@ -0,0 +1,16 @@
+- hosts: music-player
+  pre_tasks:
+  - name: install terminfo
+    pacman:
+      state: present # not required. choices: absent;latest;present. Desired state of the package.
+      name: 
+        - termite-terminfo # not required. Name or list of names of the packages to install, upgrade, or remove.
+    become: yes
+
+  roles:
+  - user_config
+  - cronie
+  - hass-client-control
+  - mpd
+
+

roles/ssmtp/tasks/main.yml

@@ -1,6 +1,6 @@
 
 - name: Install SSMTP
-  aur: name=ssmtp skip_installed=yes
+  aur: name=ssmtp state=present
   become_user: aur_builder
 
 

server.yml

@@ -9,6 +9,7 @@
     become: yes
 
   roles:
+  - syncthing
   - ssmtp
   - cronie
   - rsyncd

site.yml

@@ -1,5 +1,6 @@
 ---
 - import_playbook: global.yml
+- import_playbook: music-player.yml
 - import_playbook: server.yml
 - import_playbook: workstation.yml
 

workstation.yml

@@ -1,10 +1,12 @@
 ---
 - hosts: workstation
   roles:
+  - syncthing
   - user_config
   - ansible-manager
   - mpd
   - virt
+  - hass-client-control
   - workstation
   - cups
   - grub_themes