From fcd55b9ae0bdfce4a35258e092f81b7ab9ba1712 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Mon, 22 Mar 2021 21:29:09 +0100
Subject: [PATCH] review inventory

---
 build.yml                    | 16 ++++++++++++++++
 group_vars/{debian => build} | 19 ++++++++++++++++++-
 production                   |  7 +++++--
 provisionning.yml            |  2 +-
 site.yml                     |  3 ++-
 staging                      | 11 +++++++----
 6 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 build.yml
 rename group_vars/{debian => build} (65%)

diff --git a/build.yml b/build.yml
new file mode 100644
index 0000000..a790ac2
--- /dev/null
+++ b/build.yml
@@ -0,0 +1,16 @@
+---
+- hosts: build
+  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
+  vars:
+      #    certbot_force: true
+  roles:
+  - {role: nginx, become: yes }  
+  - {role: ansible-role-postgresql, become: yes }
+  - php
+  - user_config
diff --git a/group_vars/debian b/group_vars/build
similarity index 65%
rename from group_vars/debian
rename to group_vars/build
index 31e664a..5aab165 100644
--- a/group_vars/debian
+++ b/group_vars/build
@@ -1,5 +1,22 @@
+systemd_mounts: 
+    diskstation_git:
+        share: diskstation.ducamps.win:/volume2/git
+        mount: /mnt/diskstation/git
+        type: nfs
+        options:
+            - " "
+        automount: true
+systemd_mounts_enabled:
+    - diskstation_git
+nginx_error_log: "/var/log/nginx/error.log debug"
+docker_users: 
+    - "{{ user.name }}"
+postgresql_users:
+    - name: root
+      role_attr_flags: SUPERUSER
+      password: "{{ vault_mysql_root }}"
 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
\ No newline at end of file
+      sshkey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDBrP9akjyailPU9tUMvKrtDsqjI191W1L95u3OFjBqqapXgbDVx1FVtSlIIKcCHZyTII1zgC7woZmNRpmaIJRh6N+VIuRrRs29xx2GUVc4pxflUwwIAK36hgZS3nqmA2biacmPR9HogZLZMcPtZdLhWGlLuUv1cWqbqW7UcDa0lbubCo2v4OQMx/zt37voKAZSkkbH9mVszH6eKxNFy1KXbLYhwXiKfYBnAHbivhiSkZUGV6D4HNj8Jx6IY1YF3bfwMXmt841Q/7OY+t3RTIS8ewvSF+jpQ7GKHBEsZTZUGwIoSyZFFvCgKQVOJu/ZJJS4HNkluilir9Sxtx2LRgy+HHQ251trnsVsJp3ts4uTiMkKJQy1PXy1ZvQXYkip9Af3vlXUMmTyVj8cv+No07G1rZ1pZ3wXKX4RkTsoep5GsYlhyUd7GzsAQQiX9YhYyWDQ6NHBYAGAWbw2BLNxltWa4AyWOa1C8v+1+mRwdvpdMY7powJNCXQaIJmiOZiI/Us= vincent@fixe-pc-2020-03-01
diff --git a/production b/production
index ef8e6cd..4315142 100644
--- a/production
+++ b/production
@@ -3,7 +3,10 @@ oscar
 
 [workstation]
 fixe-pc
-zen-pc
-tablette
+
+[workstation:children]
+laptop
+
 [laptop]
 zen-pc
+tablette
diff --git a/provisionning.yml b/provisionning.yml
index c093fb9..cf95073 100644
--- a/provisionning.yml
+++ b/provisionning.yml
@@ -12,4 +12,4 @@
     - ansible_bootstrap
 
 - remote_user: "{{ user.name }}"
-  import_playbook: global.yml
+  import_playbook: site.yml
diff --git a/site.yml b/site.yml
index 8063132..4268064 100644
--- a/site.yml
+++ b/site.yml
@@ -2,5 +2,6 @@
 - import_playbook: global.yml
 - import_playbook: music-player.yml
 - import_playbook: server.yml
+- import_playbook: build.yml
 - import_playbook: workstation.yml
-- import_playbook: debian.yml
\ No newline at end of file
+- import_playbook: debian.yml
diff --git a/staging b/staging
index 991ce6e..cbff837 100644
--- a/staging
+++ b/staging
@@ -1,15 +1,18 @@
 [workstation]
-VMAW
+
+[workstation:children]
+laptop
 
 [laptop]
 VMAW
 
+[build]
+VMDS
+VMAS-BUILD
+
 [server:children]
 VMServer
 
 [VMServer]
 VMAS-HML
-VMAS-BUILD
 
-[debian]
-VMDS