Commits

Brent Tubbs committed 7be33d6 Merge

merge

Comments (0)

Files changed (6)

+393575a388711ac92cbefa0f109f2cbee617c70b 0.2.91
 09d1b05e463c73e5652720699575a5e8f34ad6d3 0.3.0
 bd84725408308e6c96b18d9af9dd2e432a22b0dd 0.3.2
 ece623ea336f536845f379e9e6f4c2118b6b2e1f 0.3.3
File contents unchanged.

silk/conf_templates/nginx.conf

File contents unchanged.

silk/conf_templates/nginx_root.conf

+user www-data;
+worker_processes  4;
+
+error_log  /var/log/nginx/error.log;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+    # multi_accept on;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+
+    access_log	/var/log/nginx/access.log;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+    tcp_nodelay        on;
+
+    gzip  on;
+    gzip_disable "MSIE [1-6]\.(?!.*SV1)";
+
+    #includes that come with stock nginx
+    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/sites-enabled/*;
+
+    #include config files from all silk sites
+    include %(srv_root)s/*/conf/nginx.conf;
+}

silk/conf_templates/supervisord.conf

File contents unchanged.

silk/conf_templates/supervisord_root.conf

+; supervisor config file
+
+[unix_http_server]
+file=/var/run//supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+
+[inet_http_server]
+port = 127.0.0.1:9001
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run//supervisor.sock ; use a unix:// URL  for a unix socket
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = %(srv_root)s/*/conf/supervisord.conf