From d1f0f01724a83613d5338d2ca182da370b75e5f9 Mon Sep 17 00:00:00 2001
From: goatie999 <markley79@gmail.com>
Date: Mon, 27 Apr 2020 23:39:29 +0100
Subject: [PATCH] Update and rename nginx.setup to nginx.conf

---
 nginx.conf  | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 nginx.setup |  19 ----------
 2 files changed, 105 insertions(+), 19 deletions(-)
 create mode 100644 nginx.conf
 delete mode 100644 nginx.setup

diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..9b8eb68
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,105 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+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_vary on;
+	# gzip_proxied any;
+	# gzip_comp_level 6;
+	# 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;
+
+	##
+	# Virtual Host Configs
+	##
+
+	include /etc/nginx/conf.d/*.conf;
+	include /etc/nginx/sites-enabled/*;
+}
+
+
+#mail {
+#	# See sample authentication script at:
+#	# http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
+# 
+#	# auth_http localhost/auth.php;
+#	# pop3_capabilities "TOP" "USER";
+#	# imap_capabilities "IMAP4rev1" "UIDPLUS";
+# 
+#	server {
+#		listen     localhost:110;
+#		protocol   pop3;
+#		proxy      on;
+#	}
+# 
+#	server {
+#		listen     localhost:143;
+#		protocol   imap;
+#		proxy      on;
+#	}
+#}
+
+# RTMP Related Settings for NGINX service
+# help for what's defined here: https://github.com/arut/nginx-rtmp-module/wiki
+
+rtmp_auto_push on;
+rtmp_auto_push_reconnect 1s;
+
+rtmp {
+    server {
+        listen 1935;
+        chunk_size 4096;
+
+        application live {
+            live on;
+            record off;
+            #facebook
+            #restream
+        }
+    }
+}
diff --git a/nginx.setup b/nginx.setup
deleted file mode 100644
index ea948dc..0000000
--- a/nginx.setup
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# RTMP Related Settings for NGINX service
-
-rtmp_auto_push on;
-rtmp_auto_push_reconnect 1s;
-
-rtmp {
-    server {
-        listen 1935;
-        chunk_size 4096;
-
-        application live {
-            live on;
-            record off;
-            push rtmp://localhost:19350/rtmp/10155558020291650?s_bl=1&s_ps=1&s_sw=0&s_vt=api-s&a=AbyyuvgLyPT_ZMz9;
-            push rtmp://live.restream.io/live/re_452408_bb1b755b63b5b94974dc;
-        }
-    }
-}