Merge pull request #60 from dlee35/master

fix filename and grep checks

salt/common/nginx/nginx.conf.so-sensor

@@ -0,0 +1,89 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+# Load dynamic modules. See /usr/share/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    # Load modular configuration files from the /etc/nginx/conf.d directory.
+    # See http://nginx.org/en/docs/ngx_core_module.html#include
+    # for more information.
+    include /etc/nginx/conf.d/*.conf;
+
+    server {
+        listen       80 default_server;
+        listen       [::]:80 default_server;
+        server_name  _;
+        root         /usr/share/nginx/html;
+
+        # Load configuration files for the default server block.
+        include /etc/nginx/default.d/*.conf;
+
+        location / {
+        }
+
+        error_page 404 /404.html;
+            location = /40x.html {
+        }
+
+        error_page 500 502 503 504 /50x.html;
+            location = /50x.html {
+        }
+    }
+
+# Settings for a TLS enabled server.
+#
+#    server {
+#        listen       443 ssl http2 default_server;
+#        listen       [::]:443 ssl http2 default_server;
+#        server_name  _;
+#        root         /usr/share/nginx/html;
+#
+#        ssl_certificate "/etc/pki/nginx/server.crt";
+#        ssl_certificate_key "/etc/pki/nginx/private/server.key";
+#        ssl_session_cache shared:SSL:1m;
+#        ssl_session_timeout  10m;
+#        ssl_ciphers HIGH:!aNULL:!MD5;
+#        ssl_prefer_server_ciphers on;
+#
+#        # Load configuration files for the default server block.
+#        include /etc/nginx/default.d/*.conf;
+#
+#        location / {
+#        }
+#
+#        error_page 404 /404.html;
+#            location = /40x.html {
+#        }
+#
+#        error_page 500 502 503 504 /50x.html;
+#            location = /50x.html {
+#        }
+#    }
+
+}

so-setup-network.sh

@@ -50,7 +50,9 @@ add_master_hostfile() {
   "Enter your Master Server IP Address" 10 60 X.X.X.X 3>&1 1>&2 2>&3)
 
   # Add the master to the host file if it doesn't resolve
+  if ! grep -q $MSRVIP /etc/hosts; then
     echo "$MSRVIP   $MSRV" >> /etc/hosts
+  fi
 }
 
 add_socore_user_master() {
@@ -298,7 +300,9 @@ create_bond() {
 
     # Need to add 17.04 support still
     apt-get -y install ifenslave
+    if ! grep -q bonding /etc/modules; then
       echo "bonding" >> /etc/modules
+    fi
     modprobe bonding
 
     local LBACK=$(awk '/auto lo/,/^$/' /etc/network/interfaces)
@@ -986,7 +990,9 @@ set_updates() {
   echo "MASTERUPDATES is $MASTERUPDATES"
   if [ $MASTERUPDATES == 'MASTER' ]; then
     if [ $OS == 'centos' ]; then
+      if ! grep -q $MSRV /etc/yum.conf; then
       echo "proxy=http://$MSRV:3142" >> /etc/yum.conf
+    fi
 
     else
 
@@ -1680,7 +1686,7 @@ if (whiptail_you_sure); then
     sensor_pillar
     saltify
     docker_install
-    configure_minion SENSOR
+    configure_minion sensor
     copy_minion_pillar sensors
     salt_firstcheckin
     # Accept the Salt Key