Added host and clark servers, adjusted how laradev works

pillars/roles/host/host1.sls

@@ -0,0 +1,3 @@
+host:
+  mac: b8:97:5a:49:70:fe
+  port: enp2s0

pillars/roles/host/host2.sls

@@ -0,0 +1,3 @@
+host:
+  mac: 00:25:90:81:4d:ff
+  port: enp2s0

pillars/roles/host/init.sls

@@ -0,0 +1,13 @@
+{% set states = salt['cp.list_states'](saltenv) %}
+include:
+  - roles.host.none
+
+{%- if grains['roles'] is defined -%}
+  {%- if grains['roles'] is not none -%}
+    {%- for role in grains['roles'] %}
+      {%- if 'pillars.roles.host.'+role in states %}
+  - roles.host.{{ role }}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- endif -%}
+{%- endif -%}

pillars/roles/init.sls

@@ -11,3 +11,4 @@ include:
   - roles.laradev
   - roles.lxc
   - roles.router
+  - roles.host

pillars/roles/laradev/clark-family.sls

@@ -0,0 +1,3 @@
+laradev:
+  clark:
+    repo: "https://git.actcur.com/karenp/Clark-family.git"

pillars/roles/nginx/bbs.sls

@@ -0,0 +1,13 @@
+nginx:
+  bbs:
+    auth: none
+    https:
+      port: 4433
+      prot: https
+
+portal:
+  Dev:
+    bbs:
+      name: BBS Web Site
+      summary: Bowens Bus Service Dev Site
+      public: false

pillars/roles/nginx/clark-family.sls

@@ -0,0 +1,13 @@
+nginx:
+  clark:
+    auth: none
+    https:
+      port: 4433
+      prot: https
+
+portal:
+  Dev:
+    clark:
+      name: Clark Family Genealogy
+      summary: Clark Family Genealogy Dev Site
+      public: false

pillars/roles/nginx/ra.sls

@@ -4,11 +4,6 @@ nginx:
     https:
       port: 4433
       prot: https
-  bbs:
-    auth: none
-    https:
-      port: 4433
-      prot: https
 
 portal:
   Dev:
@@ -16,7 +11,3 @@ portal:
       name: Redacted Audio
       summary: Redacted Audio Dev Server Site
       public: false
-    bbs:
-      name: BBS Web Site
-      summary: Bowens Bus Service Dev Site
-      public: false

pillars/servers/env/server/clark.sls

@@ -0,0 +1 @@
+env: prod

pillars/servers/roles/server/clark.sls

@@ -0,0 +1,9 @@
+grains:
+  roles:
+    - server
+    - ssh
+    - nrpe
+    - saltminion
+    - laradev
+    - clark-family
+    - nginx-proxy

pillars/servers/roles/server/host.sls

@@ -5,3 +5,5 @@ grains:
     - nrpe
     - saltminion
     - backup
+    - host
+    - host2

pillars/servers/roles/server/host2.sls

@@ -4,4 +4,6 @@ grains:
     - ssh
     - nrpe
     - saltminion
+    - backup
     - host
+    - host2

states/basepkgs/init.sls

@@ -9,7 +9,6 @@ basepkgs:
       - htop
       - git
       - net-tools
-      - bind-tools
 {% elif grains['os_family'] == 'Debian' %}
 basepkgs:
   pkg.installed:

states/roles/maintain/host/br1.netdev

@@ -0,0 +1,4 @@
+[NetDev]
+Name=br1
+Kind=bridge
+MACAddress={{pillar['host']['mac']}}

states/roles/maintain/host/br1.network

@@ -0,0 +1,4 @@
+[Match]
+Name=br1
+[Network]
+DHCP=ipv4

states/roles/maintain/host/init.sls

@@ -9,3 +9,93 @@ install_host_pkgs:
       - net-tools
       - speedtest-cli
       - btrfs-progs
+      - libvirt
+      - bridge-utils
+
+/virtual/qemu:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 755
+    - makedirs: true
+
+/etc/libvirt/qemu:
+  mount.mounted:
+    - device: /virtual/qemu
+    - fstype: none
+    - opts: bind
+    - dump: 0
+    - pass_num: 3
+    - persist: True
+    - mkmnt: True
+
+/virtual/storage:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 755
+    - makedirs: true
+
+/etc/libvirt/storage:
+  mount.mounted:
+    - device: /virtual/storage
+    - fstype: none
+    - opts: bind
+    - dump: 0
+    - pass_num: 3
+    - persist: True
+    - mkmnt: True
+
+/virtual/images:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 755
+    - makedirs: true
+
+/var/lib/libvirt/images:
+  mount.mounted:
+    - device: /virtual/images
+    - fstype: none
+    - opts: bind
+    - dump: 0
+    - pass_num: 3
+    - persist: True
+    - mkmnt: True
+
+libvirtd:
+  service.running:
+    - enable: true
+
+/etc/systemd/network/br1.network:
+  file.managed:
+    - makedirs: true
+    - source: salt://roles/maintain/host/br1.network
+    - user: root
+    - group: root
+    - mode: 644
+
+/etc/systemd/network/uplink.network:
+  file.managed:
+    - makedirs: true
+    - source: salt://roles/maintain/host/uplink.network
+    - user: root
+    - group: root
+    - mode: 644
+    - template: jinja
+
+/etc/systemd/network/br1.netdev:
+  file.managed:
+    - makedirs: true
+    - source: salt://roles/maintain/host/br1.netdev
+    - user: root
+    - group: root
+    - mode: 644
+    - template: jinja
+
+#systemd-networkd:
+#  service.running:
+#    - watch:
+#      - file: /etc/systemd/network/br1.netdev
+#      - file: /etc/systemd/network/br1.network
+#      - file: /etc/systemd/network/uplink.network

states/roles/maintain/host/uplink.network

@@ -0,0 +1,5 @@
+[Match]
+Name={{pillar['host']['port']}}
+
+[Network]
+Bridge=br1

states/roles/maintain/laradev/init.sls

@@ -17,7 +17,7 @@ laradev-php-fpm:
     - enable: true
     - watch:
       - file: /etc/php/php.ini
-      
+
 laradev-sqlite:
   pkg.installed:
     - name: sqlite
@@ -68,8 +68,9 @@ laradev-nginx-conf:
 
 {%- if pillar['laradev'] is defined -%}
 {%- for server in pillar['laradev'] %}
-"/etc/nginx/certs/{{server}}.actcur.com/":
+"laradev-certs/{{server}}.actcur.com/":
   file.recurse:
+    - name: /etc/nginx/certs/{{server}}.actcur.com/
     - source: salt://secure/certs/{{server}}.actcur.com/
 {%- if os=="CentOS" or os=="RedHat" %}
     - user: nginx
@@ -82,8 +83,9 @@ laradev-nginx-conf:
     - file_mode: 400
     - clean: true
 
-/etc/nginx/conf.d/{{ server }}.conf:
+laradev-nginx-{{ server }}.conf:
   file.managed:
+    - name: /etc/nginx/conf.d/{{ server }}.conf
     - makedirs: true
     - source: salt://roles/maintain/laradev/nginx.conf
     - user: root
@@ -92,7 +94,7 @@ laradev-nginx-conf:
     - template: jinja
     - context:
       server: {{ server }}
-      
+
 {% endfor %}
 {% endif %}