Merge branch 'release/0.5.1'

thegreatsunra · Aug 1, 2017 · 1b0b6d0 · 1b0b6d0
2 parents bf79c50 + 88c660d
commit 1b0b6d0
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 42 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.0
+0.5.1
diff --git a/scripts/cloud-init.sh.txt b/scripts/cloud-init.sh.txt
@@ -271,7 +271,8 @@ runcmd:
   - echo 'CONFIGURING RKHUNTER'
   - printf '=======\n\n'
 ## Update rookit hunter and update its properties definition list:
-  - rkhunter --update && rkhunter --propupd
+  - rkhunter --update
+  - rkhunter --propupd
 
 ###########
 ## LYNIS ##
@@ -284,8 +285,8 @@ runcmd:
 ## Add the URL for lynis' package server:
   - echo 'deb https://packages.cisofy.com/community/lynis/deb/ xenial main' >> /etc/apt/sources.list.d/cisofy-lynis.list
 ## Grab latest apt updates now that we can query lynis' package server, and install the latest available version of lynis:
-  - apt update
-  - DEBIAN_FRONTEND=noninteractive apt install -y lynis
+  - apt update -yq
+  - DEBIAN_FRONTEND=noninteractive apt install -yq lynis
 
 #################
 ## PHP + NGINX ##

diff --git a/scripts/manual-commands.sh.txt b/scripts/manual-commands.sh.txt
@@ -51,7 +51,7 @@ sudo service nginx start
 sudo service php7.1-fpm start
 
 ## Install and configure sendmail
-sudo apt install -y sendmail sendmail-bin
+sudo apt install -yq sendmail sendmail-bin
 # Configure with existing? Y
 # Configure with existing? Y
 # Reload? Y
@@ -72,9 +72,6 @@ sudo sed -i -e 's/# listen 443 ssl http2;/listen 443 ssl http2;/' /etc/nginx/sit
 ## Reboot the system
 sudo reboot
 
-## Remove unnecessary packages
-sudo apt autoremove -y
-
 ## Run rootkit hunter
 sudo rkhunter --checkall --skip-keypress
 

diff --git a/templates/etc/nginx/nginx.conf.txt b/templates/etc/nginx/nginx.conf.txt
@@ -1,46 +1,45 @@
-user             __username__;
-worker_processes 1;
-pid              /var/run/nginx.pid;
+user                                __username__;
+worker_processes                    1;
+pid                                 /var/run/nginx.pid;
 
 events {
-    worker_connections 1024;
-    multi_accept       on;
+    worker_connections              1024;
+    multi_accept                    on;
 }
 
 http {
-    include         /etc/nginx/mime.types;
-    default_type    application/octet-stream;
+    include                         /etc/nginx/mime.types;
+    default_type                    application/octet-stream;
 
-    log_format      main  '$remote_addr - $remote_user [$time_local] "$request" '
+    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;
-    error_log       /var/log/nginx/error.log warn;
-
-    server_tokens   off;
-    sendfile        on;
-    tcp_nopush      on;
-    tcp_nodelay     on;
-    server_names_hash_bucket_size 64;
-    types_hash_max_size           2048;
-    client_max_body_size          64m;
-    keepalive_timeout             15;
-
-    ssl_protocols             TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
-    ssl_prefer_server_ciphers on;
-    ssl_session_cache         shared:SSL:10m;
-    ssl_session_timeout       10m;
-
-    gzip on;
-    gzip_disable "msie6";
-
-    # gzip_vary on;
-    gzip_proxied        any;
-    gzip_comp_level     2;
-    # gzip_buffers      16 8k;
-    # gzip_http_version 1.1;
-    gzip_types          text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+    access_log                      /var/log/nginx/access.log main;
+    error_log                       /var/log/nginx/error.log warn;
+    server_tokens                   off;
+    sendfile                        on;
+    tcp_nopush                      on;
+    tcp_nodelay                     on;
+    server_names_hash_bucket_size   64;
+    types_hash_max_size             2048;
+    client_max_body_size            64m;
+    keepalive_timeout               15;
+
+    ssl_protocols                   TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+    ssl_prefer_server_ciphers       on;
+    ssl_session_cache               shared:SSL:10m;
+    ssl_session_timeout             10m;
+
+    gzip                            on;
+    gzip_disable                    "msie6";
+
+    # gzip_vary                     on;
+    gzip_proxied                    any;
+    gzip_comp_level                 2;
+    # gzip_buffers                  16 8k;
+    # gzip_http_version             1.1;
+    gzip_types                      text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
     include /etc/nginx/conf.d/*.conf;
     include /etc/nginx/sites-enabled/*;