Browse Source

Fixed wrong directory for default.conf

pull/8/head
Muthu Kumar 7 years ago
parent
commit
b5a7413c56
  1. 1
      actions/killALL.js
  2. 156
      build/defaultNginx.conf
  3. 1
      index.js
  4. 5
      utils/nginxConf.js

1
actions/killALL.js

@ -18,7 +18,6 @@ function killALL () {
shell.mkdir('-p', npath.confD()); shell.mkdir('-p', npath.confD());
shell.mkdir('-p', npath.enabledSites()); shell.mkdir('-p', npath.enabledSites());
shell.mkdir('-p', npath.webRoot()); shell.mkdir('-p', npath.webRoot());
console.log(conf(npath.confD()));
shell.cp((path.join(__dirname, '/../build/defaultNginx.conf')), shell.cp((path.join(__dirname, '/../build/defaultNginx.conf')),
conf(npath.confD())); conf(npath.confD()));
// Create the default.conf file // Create the default.conf file

156
build/defaultNginx.conf

@ -1,136 +1,52 @@
#user nobody; server {
#Defines which Linux system user will own and run the Nginx server # You would want to make a separate file with its own server block for each virtual domain
# on your server and then include them.
listen 80;
#tells Nginx the hostname and the TCP port where it should listen for HTTP connections.
# listen 80; is equivalent to listen *:80;
worker_processes 1; server_name localhost;
#Referes to single threaded process. Generally set to be equal to the number of CPUs or cores. # lets you doname-based virtual hosting
#error_log logs/error.log; #error_log logs/error.log notice; #charset koi8-r;
#Specifies the file where server logs.
#pid logs/nginx.pid; #access_log logs/host.access.log main;
#nginx will write its master process ID(PID).
events {
worker_connections 1024;
# worker_processes and worker_connections allows you to calculate maxclients value:
# max_clients = worker_processes * worker_connections
}
location / {
#The location setting lets you configure how nginx responds to requests for resources within the server.
root html;
index index.html index.htm;
}
http { #error_page 404 /404.html;
include mime.types;
# anything written in /opt/nginx/conf/mime.types is interpreted as if written inside the http { } block
default_type application/octet-stream; # redirect server error pages to the static page /50x.html
# #
error_page 500 502 503 504 /50x.html;
#log_format main '$remote_addr - $remote_user [$time_local] "$request" ' location = /50x.html {
# '$status $body_bytes_sent "$http_referer" ' root html;
# '"$http_user_agent" "$http_x_forwarded_for"';
#access_log logs/access.log main;
sendfile on;
# If serving locally stored static files, sendfile is essential to speed up the server,
# But if using as reverse proxy one can deactivate it
#tcp_nopush on;
# works opposite to tcp_nodelay. Instead of optimizing delays, it optimizes the amount of data sent at once.
#keepalive_timeout 0;
keepalive_timeout 65;
# timeout during which a keep-alive client connection will stay open.
#gzip on;
# tells the server to use on-the-fly gzip compression.
server {
# You would want to make a separate file with its own server block for each virtual domain
# on your server and then include them.
listen 80;
#tells Nginx the hostname and the TCP port where it should listen for HTTP connections.
# listen 80; is equivalent to listen *:80;
server_name localhost;
# lets you doname-based virtual hosting
#charset koi8-r;
#access_log logs/host.access.log main;
location / {
#The location setting lets you configure how nginx responds to requests for resources within the server.
root html;
index index.html index.htm;
}
#error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
#
#location ~ \.php$ {
# proxy_pass http://127.0.0.1;
#}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
# root html;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# include fastcgi_params;
#}
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
} }
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
# another virtual host using mix of IP-, name-, and port-based configuration
# #
#server { #location ~ \.php$ {
# listen 8000; # proxy_pass http://127.0.0.1;
# listen somename:8080;
# server_name somename alias another.alias;
# location / {
# root html;
# index index.html index.htm;
# }
#} #}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
# HTTPS server
# #
#server { #location ~ \.php$ {
# listen 443 ssl; # root html;
# server_name localhost; # fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# ssl_certificate cert.pem; # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# ssl_certificate_key cert.key; # include fastcgi_params;
# ssl_session_cache shared:SSL:1m;
# ssl_session_timeout 5m;
# ssl_ciphers HIGH:!aNULL:!MD5;
# ssl_prefer_server_ciphers on;
# location / {
# root html;
# index index.html index.htm;
# }
#} #}
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
} }

1
index.js

@ -90,7 +90,6 @@ program
.command('kill-all') .command('kill-all')
.description('Warning! Will completely kill all servers and reset nginx') .description('Warning! Will completely kill all servers and reset nginx')
.action(function() { .action(function() {
//new Promise(resolve => killed\killAllConfirm();
killAllConfirm(); killAllConfirm();
}); });

5
utils/nginxConf.js

@ -4,9 +4,10 @@
// concatenates them with ".conf" and returns it. // concatenates them with ".conf" and returns it.
function conf(path, domain, outPort) { function conf(path, domain, outPort) {
domain = domain || ""; domain = domain || "default";
outPort = outPort || ""; outPort = outPort || "";
return (path + domain + "." + outPort + ".conf"); if (outPort != "") outPort = "." + outPort;
return (path + domain + outPort + ".conf");
} }
module.exports = conf; module.exports = conf;

Loading…
Cancel
Save