From 62bd4a6f35de00a041dce46fa6c23db4c08ba7a7 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Mon, 27 Mar 2023 10:38:35 -0500 Subject: [PATCH] further work on webserver state - rename apache->webserver state - configure firewall rules to permit http/https - fix index.html path --- srv/salt/apache/init.sls | 7 ------ srv/salt/top.sls | 2 +- srv/salt/webserver/index.html | 7 ++++++ srv/salt/webserver/init.sls | 25 ++++++++++++++++++++ srv/salt/{apache => webserver}/uninstall.sls | 4 ++++ 5 files changed, 37 insertions(+), 8 deletions(-) delete mode 100644 srv/salt/apache/init.sls create mode 100644 srv/salt/webserver/index.html create mode 100644 srv/salt/webserver/init.sls rename srv/salt/{apache => webserver}/uninstall.sls (51%) diff --git a/srv/salt/apache/init.sls b/srv/salt/apache/init.sls deleted file mode 100644 index e130a3a..0000000 --- a/srv/salt/apache/init.sls +++ /dev/null @@ -1,7 +0,0 @@ -install_apache: - pkg.installed: - - name: {{ pillar['pkgs']['apache'] }} - service.running: - - require: - - pkg: {{ pillar['pkgs']['apache'] }} - - name: {{ pillar['pkgs']['apache'] }} diff --git a/srv/salt/top.sls b/srv/salt/top.sls index 32848fb..6760f1b 100644 --- a/srv/salt/top.sls +++ b/srv/salt/top.sls @@ -6,4 +6,4 @@ base: - users 'roles:web': - match: grain - - apache + - webserver diff --git a/srv/salt/webserver/index.html b/srv/salt/webserver/index.html new file mode 100644 index 0000000..6fc03bc --- /dev/null +++ b/srv/salt/webserver/index.html @@ -0,0 +1,7 @@ + + + Salt rocks + +

This file brought to you by Salt

+ + \ No newline at end of file diff --git a/srv/salt/webserver/init.sls b/srv/salt/webserver/init.sls new file mode 100644 index 0000000..b36f559 --- /dev/null +++ b/srv/salt/webserver/init.sls @@ -0,0 +1,25 @@ +install_apache: + pkg.installed: + - name: {{ pillar['pkgs']['apache'] }} + service.running: + - name: {{ pillar['pkgs']['apache'] }} + - require: + - pkg: {{ pillar['pkgs']['apache'] }} + +install_html_file: + file.managed: + - name: /var/www/html/index.html + - source: salt://webserver/index.html + - require: + - pkg: {{ pillar['pkgs']['apache'] }} + +configure_firewall: + pkg.installed: + - name: firewalld + firewalld.present: + - require: + - pkg: firewalld + - name: public + - services: + - http + - https \ No newline at end of file diff --git a/srv/salt/apache/uninstall.sls b/srv/salt/webserver/uninstall.sls similarity index 51% rename from srv/salt/apache/uninstall.sls rename to srv/salt/webserver/uninstall.sls index 673d33b..6d22830 100644 --- a/srv/salt/apache/uninstall.sls +++ b/srv/salt/webserver/uninstall.sls @@ -1,3 +1,7 @@ uninstall_apache: pkg.removed: - name: {{ pillar['pkgs']['apache'] }} + +remove_html_file: + file.absent: + - name: /var/www/html/index.html