From 6585c0dd19fc67ece1229ca1cd43145642a20c77 Mon Sep 17 00:00:00 2001 From: Beth Parker Date: Wed, 29 Jul 2020 20:22:01 -0500 Subject: [PATCH] Added host and clark servers, adjusted how laradev works --- pillars/roles/host/host1.sls | 3 + pillars/roles/host/host2.sls | 3 + pillars/roles/host/init.sls | 13 +++ pillars/roles/host/none.sls | 0 pillars/roles/init.sls | 1 + pillars/roles/laradev/clark-family.sls | 3 + pillars/roles/nginx/bbs.sls | 13 +++ pillars/roles/nginx/clark-family.sls | 13 +++ pillars/roles/nginx/{laradev.sls => ra.sls} | 9 --- pillars/servers/env/server/clark.sls | 1 + pillars/servers/roles/server/clark.sls | 9 +++ pillars/servers/roles/server/host.sls | 2 + pillars/servers/roles/server/host2.sls | 2 + states/basepkgs/init.sls | 1 - states/roles/maintain/host/br1.netdev | 4 + states/roles/maintain/host/br1.network | 4 + states/roles/maintain/host/init.sls | 90 +++++++++++++++++++++ states/roles/maintain/host/uplink.network | 5 ++ states/roles/maintain/laradev/init.sls | 10 ++- 19 files changed, 172 insertions(+), 14 deletions(-) create mode 100644 pillars/roles/host/host1.sls create mode 100644 pillars/roles/host/host2.sls create mode 100644 pillars/roles/host/init.sls create mode 100644 pillars/roles/host/none.sls create mode 100644 pillars/roles/laradev/clark-family.sls create mode 100644 pillars/roles/nginx/bbs.sls create mode 100644 pillars/roles/nginx/clark-family.sls rename pillars/roles/nginx/{laradev.sls => ra.sls} (53%) create mode 100644 pillars/servers/env/server/clark.sls create mode 100644 pillars/servers/roles/server/clark.sls create mode 100644 states/roles/maintain/host/br1.netdev create mode 100644 states/roles/maintain/host/br1.network create mode 100644 states/roles/maintain/host/uplink.network diff --git a/pillars/roles/host/host1.sls b/pillars/roles/host/host1.sls new file mode 100644 index 0000000..cdf2d10 --- /dev/null +++ b/pillars/roles/host/host1.sls @@ -0,0 +1,3 @@ +host: + mac: b8:97:5a:49:70:fe + port: enp2s0 diff --git a/pillars/roles/host/host2.sls b/pillars/roles/host/host2.sls new file mode 100644 index 0000000..2d31eb1 --- /dev/null +++ b/pillars/roles/host/host2.sls @@ -0,0 +1,3 @@ +host: + mac: 00:25:90:81:4d:ff + port: enp2s0 diff --git a/pillars/roles/host/init.sls b/pillars/roles/host/init.sls new file mode 100644 index 0000000..6074e07 --- /dev/null +++ b/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 -%} diff --git a/pillars/roles/host/none.sls b/pillars/roles/host/none.sls new file mode 100644 index 0000000..e69de29 diff --git a/pillars/roles/init.sls b/pillars/roles/init.sls index 4cfb709..dd142d6 100644 --- a/pillars/roles/init.sls +++ b/pillars/roles/init.sls @@ -11,3 +11,4 @@ include: - roles.laradev - roles.lxc - roles.router + - roles.host diff --git a/pillars/roles/laradev/clark-family.sls b/pillars/roles/laradev/clark-family.sls new file mode 100644 index 0000000..802c0b9 --- /dev/null +++ b/pillars/roles/laradev/clark-family.sls @@ -0,0 +1,3 @@ +laradev: + clark: + repo: "https://git.actcur.com/karenp/Clark-family.git" diff --git a/pillars/roles/nginx/bbs.sls b/pillars/roles/nginx/bbs.sls new file mode 100644 index 0000000..bdc41e2 --- /dev/null +++ b/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 diff --git a/pillars/roles/nginx/clark-family.sls b/pillars/roles/nginx/clark-family.sls new file mode 100644 index 0000000..150cf95 --- /dev/null +++ b/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 diff --git a/pillars/roles/nginx/laradev.sls b/pillars/roles/nginx/ra.sls similarity index 53% rename from pillars/roles/nginx/laradev.sls rename to pillars/roles/nginx/ra.sls index e8986d8..2fe79b0 100644 --- a/pillars/roles/nginx/laradev.sls +++ b/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 diff --git a/pillars/servers/env/server/clark.sls b/pillars/servers/env/server/clark.sls new file mode 100644 index 0000000..2fdef9a --- /dev/null +++ b/pillars/servers/env/server/clark.sls @@ -0,0 +1 @@ +env: prod diff --git a/pillars/servers/roles/server/clark.sls b/pillars/servers/roles/server/clark.sls new file mode 100644 index 0000000..03fbe64 --- /dev/null +++ b/pillars/servers/roles/server/clark.sls @@ -0,0 +1,9 @@ +grains: + roles: + - server + - ssh + - nrpe + - saltminion + - laradev + - clark-family + - nginx-proxy diff --git a/pillars/servers/roles/server/host.sls b/pillars/servers/roles/server/host.sls index 113dc5c..ef830af 100644 --- a/pillars/servers/roles/server/host.sls +++ b/pillars/servers/roles/server/host.sls @@ -5,3 +5,5 @@ grains: - nrpe - saltminion - backup + - host + - host2 diff --git a/pillars/servers/roles/server/host2.sls b/pillars/servers/roles/server/host2.sls index b355fa1..ef830af 100644 --- a/pillars/servers/roles/server/host2.sls +++ b/pillars/servers/roles/server/host2.sls @@ -4,4 +4,6 @@ grains: - ssh - nrpe - saltminion + - backup - host + - host2 diff --git a/states/basepkgs/init.sls b/states/basepkgs/init.sls index 6fde2c2..3f895ed 100644 --- a/states/basepkgs/init.sls +++ b/states/basepkgs/init.sls @@ -9,7 +9,6 @@ basepkgs: - htop - git - net-tools - - bind-tools {% elif grains['os_family'] == 'Debian' %} basepkgs: pkg.installed: diff --git a/states/roles/maintain/host/br1.netdev b/states/roles/maintain/host/br1.netdev new file mode 100644 index 0000000..b5fe3b5 --- /dev/null +++ b/states/roles/maintain/host/br1.netdev @@ -0,0 +1,4 @@ +[NetDev] +Name=br1 +Kind=bridge +MACAddress={{pillar['host']['mac']}} diff --git a/states/roles/maintain/host/br1.network b/states/roles/maintain/host/br1.network new file mode 100644 index 0000000..b93e5ae --- /dev/null +++ b/states/roles/maintain/host/br1.network @@ -0,0 +1,4 @@ +[Match] +Name=br1 +[Network] +DHCP=ipv4 diff --git a/states/roles/maintain/host/init.sls b/states/roles/maintain/host/init.sls index 7eabf6d..e959f0a 100644 --- a/states/roles/maintain/host/init.sls +++ b/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 diff --git a/states/roles/maintain/host/uplink.network b/states/roles/maintain/host/uplink.network new file mode 100644 index 0000000..a78bdd6 --- /dev/null +++ b/states/roles/maintain/host/uplink.network @@ -0,0 +1,5 @@ +[Match] +Name={{pillar['host']['port']}} + +[Network] +Bridge=br1 diff --git a/states/roles/maintain/laradev/init.sls b/states/roles/maintain/laradev/init.sls index b230946..446fe0a 100644 --- a/states/roles/maintain/laradev/init.sls +++ b/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 %}