From 18ae1e15f4c5e2cea43e04079e43f1d3c3a0b364 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 4 Oct 2015 19:00:46 +0200
Subject: [PATCH] setup vagrant box roles and nginx package

---
 Vagrantfile                               |  1 +
 salt/bootstrap.sh                         |  8 ++++
 salt/roots/base/nginx.conf                | 56 +++++++++++++++++++++++
 salt/roots/base/nginx.sls                 | 21 +++++++++
 salt/roots/gnuviechadmin/database.sls     |  0
 salt/roots/gnuviechadmin/init.sls         |  0
 salt/roots/gnuviechadmin/queues.sls       |  0
 salt/roots/gnuviechadmin/webinterface.sls |  0
 salt/roots/webserver/init.sls             |  2 +
 9 files changed, 88 insertions(+)
 create mode 100644 salt/roots/base/nginx.conf
 create mode 100644 salt/roots/base/nginx.sls
 create mode 100644 salt/roots/gnuviechadmin/database.sls
 create mode 100644 salt/roots/gnuviechadmin/init.sls
 create mode 100644 salt/roots/gnuviechadmin/queues.sls
 create mode 100644 salt/roots/gnuviechadmin/webinterface.sls
 create mode 100644 salt/roots/webserver/init.sls

diff --git a/Vagrantfile b/Vagrantfile
index 10854f0..1fc6ff5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -58,6 +58,7 @@ Vagrant.configure(2) do |config|
       salt.minion_id = "gvadev"
       salt.masterless = true
       salt.run_highstate = true
+      salt.verbose = true
       salt.colorize = true
   end
 end
diff --git a/salt/bootstrap.sh b/salt/bootstrap.sh
index 8f3f04f..98f077e 100755
--- a/salt/bootstrap.sh
+++ b/salt/bootstrap.sh
@@ -24,3 +24,11 @@ pillar_roots:
 
 log_file: file:///dev/log
 EOF
+
+cat >/etc/salt/grains <<EOF
+roles:
+  - webserver
+  - gnuviechadmin.database
+  - gnuviechadmin.queues
+  - gnuviechadmin.webinterface
+EOF
diff --git a/salt/roots/base/nginx.conf b/salt/roots/base/nginx.conf
new file mode 100644
index 0000000..7e6a853
--- /dev/null
+++ b/salt/roots/base/nginx.conf
@@ -0,0 +1,56 @@
+user www-data;
+worker_processes 4;
+pid /run/nginx.pid;
+
+events {
+	worker_connections 768;
+	# multi_accept on;
+}
+
+http {
+
+	##
+	# Basic Settings
+	##
+
+	sendfile on;
+	tcp_nopush on;
+	tcp_nodelay on;
+	keepalive_timeout 65;
+	types_hash_max_size 2048;
+	# server_tokens off;
+
+	server_names_hash_bucket_size 64;
+	# server_name_in_redirect off;
+
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+
+	##
+	# SSL Settings
+	##
+
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+	ssl_prefer_server_ciphers on;
+
+	##
+	# Logging Settings
+	##
+
+	access_log /var/log/nginx/access.log;
+	error_log /var/log/nginx/error.log;
+
+	##
+	# Gzip Settings
+	##
+
+	gzip on;
+	gzip_disable "msie6";
+
+	##
+	# Virtual Host Configs
+	##
+
+	include /etc/nginx/conf.d/*.conf;
+	include /etc/nginx/sites-enabled/*;
+}
diff --git a/salt/roots/base/nginx.sls b/salt/roots/base/nginx.sls
new file mode 100644
index 0000000..89f149a
--- /dev/null
+++ b/salt/roots/base/nginx.sls
@@ -0,0 +1,21 @@
+nginx:
+  pkg:
+    - installed
+  service.running:
+    - enable: True
+    - require:
+      - pkg: nginx
+
+nginx-common:
+  pkg.installed
+
+/etc/nginx/nginx.conf:
+  file.managed:
+    - source: salt://base/nginx.conf
+    - user: root
+    - group: root
+    - mode: 0644
+    - require:
+      - pkg: nginx-common
+    - watch_in:
+      - service: nginx
diff --git a/salt/roots/gnuviechadmin/database.sls b/salt/roots/gnuviechadmin/database.sls
new file mode 100644
index 0000000..e69de29
diff --git a/salt/roots/gnuviechadmin/init.sls b/salt/roots/gnuviechadmin/init.sls
new file mode 100644
index 0000000..e69de29
diff --git a/salt/roots/gnuviechadmin/queues.sls b/salt/roots/gnuviechadmin/queues.sls
new file mode 100644
index 0000000..e69de29
diff --git a/salt/roots/gnuviechadmin/webinterface.sls b/salt/roots/gnuviechadmin/webinterface.sls
new file mode 100644
index 0000000..e69de29
diff --git a/salt/roots/webserver/init.sls b/salt/roots/webserver/init.sls
new file mode 100644
index 0000000..22fa765
--- /dev/null
+++ b/salt/roots/webserver/init.sls
@@ -0,0 +1,2 @@
+include:
+  - base.nginx