Infrastructure cleanup

examples/msn0.yml

@@ -11,7 +11,6 @@ all:
         staticrange: '10.0.1.1,10.0.1.223,255.255.255.0,12h'
         dns: "10.0.1.2"
         logserver: "10.0.1.16"
-        ldapserver: "10.0.1.3"
         webfront: "10.0.1.3"
         # Standards
         daemon_shell: /sbin/nologin
@@ -21,6 +20,18 @@ all:
         static: false
         wireless_ssid: 'Shadowfeed'
         ansible_python_interpreter: auto_silent
+        ldap:
+          server: "10.0.1.3"
+          orgdn: "dc=aninix,dc=net"
+          binduser: 'binduser'
+          userou: 'ou=People'
+        organization: # Information about the group
+          admin: 'DarkFeather'
+          email: 'ircs://irc.aninix.net:6697/DarkFeather'
+          displayname: 'AniNIX'
+        ssl: # Standard SSL cryptographic standards
+          identity: 'aninix.net-0001' # The Let's Encrypt identity to use
+          ciphersuite: "!NULL:!SSLv2:!SSLv3:!TLSv1:EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"
     children:
         managed:
             children:
@@ -153,7 +164,7 @@ all:
                         test2:
                             ip: 10.0.1.53
                             ipinterface: ens3
-                            mac: 00:15:5d:01:02:05
+                            mac: 00:15:5d:01:02:03
                             cores: 2
                             memory: 2
                             bridge: br0

playbooks/deploy.yml

@@ -44,6 +44,8 @@
   roles: 
       - hardware
       - SSL
+      - WebServer
+      - IRC
 
 - hosts: geth_hubs
   order: sorted
@@ -66,3 +68,12 @@
       - hardware
       - Node
 
+- hosts: DarkNet
+  order: sorted
+  serial: "{{ threads | default('16') }}"
+  gather_facts: true
+  ignore_unreachable: true
+  vars_files:
+     - "{{ lookup('env', 'ANSIBLE_VAULT_FILE') }}"
+  roles:
+      - DarkNet

playbooks/patching.yml

@@ -8,9 +8,9 @@
 #
 # Patch then restart a node
 
-- hosts: Node0
+- hosts: virtual,geth-hubs
   order: sorted
-  serial: 1
+  serial: 4
   vars: 
     ansible_become: yes
     ansible_become_method: sudo
@@ -19,7 +19,7 @@
   roles:
     - patching
 
-- hosts: managed
+- hosts: physical
   order: sorted
   ignore_unreachable: true
   serial: 4