From 837856e03bc5194c5ec7b65c368b2767e872bbe7 Mon Sep 17 00:00:00 2001
From: Roman Arutyunyan <arut@qip.ru>
Date: Thu, 27 Dec 2012 22:15:33 +0400
Subject: [PATCH] updated test nginx.conf

---
 test/nginx.conf | 87 +++++++++++++++----------------------------------
 1 file changed, 27 insertions(+), 60 deletions(-)

diff --git a/test/nginx.conf b/test/nginx.conf
index e0f94ea..35288b1 100644
--- a/test/nginx.conf
+++ b/test/nginx.conf
@@ -1,99 +1,66 @@
-
-#user  nobody;
 worker_processes  1;
 
 error_log  logs/error.log debug;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
-
-#pid        logs/nginx.pid;
-
 
 events {
     worker_connections  1024;
 }
 
-
 rtmp {
-
     server {
-
         listen 1935;
 
-        chunk_size 128;
-
-        publish_time_fix off;
-
         application myapp {
-
             live on;
 
-            record keyframes;
-            record_path /tmp;
+            #record keyframes;
+            #record_path /tmp;
+            #record_max_size 128K;
+            #record_interval 30s;
+            #record_suffix .this.is.flv;
 
-            record_max_size 128K;
-            record_interval 30s;
-
-            record_suffix .this.is.flv;
-
-            on_publish http://localhost:8080/publish;
-            on_play http://localhost:8080/play;
-            on_record_done http://localhost:8080/record_done;
-        }
-
-        application myapp2 {
-            live on;
-        }
-
-        application mypull {
-            live on;
-            pull myapp mystream localhost;
-        }
-
-        application mypush {
-            live on;
-            push myapp mystream localhost;
-            push myapp2 mystream localhost;
+            #on_publish http://localhost:8080/publish;
+            #on_play http://localhost:8080/play;
+            #on_record_done http://localhost:8080/record_done;
         }
     }
 }
 
 http {
-
     server {
-
         listen      8080;
 
-        location /publish {
-            return 201;
-        }
-
-        location /play {
-            return 202;
-        }
-
-        location /record_done {
-            return 203;
-        }
-
         location /stat {
             rtmp_stat all;
             rtmp_stat_stylesheet stat.xsl;
         }
 
         location /stat.xsl {
-            root /home/rarutyunyan/nginx-rtmp-module/;
+            root /path/to/nginx-rtmp-module/;
         }
 
+        location /control {
+            rtmp_control all;
+        }
+
+        #location /publish {
+        #    return 201;
+        #}
+
+        #location /play {
+        #    return 202;
+        #}
+
+        #location /record_done {
+        #    return 203;
+        #}
+
         location /rtmp-publisher {
-            root /home/rarutyunyan/nginx-rtmp-module/test;
+            root /path/to/nginx-rtmp-module/test;
         }
 
         location / {
-            root /home/rarutyunyan/nginx-rtmp-module/test/www;
+            root /path/to/nginx-rtmp-module/test/www;
         }
-
-
     }
 }
-