add private docker hub named harbor and update nginx web config folder to upgrade shell script for keyboard readable style

bluebamus · bluebamus · commit f247e3e656c5 · 2020-06-18T22:41:31.000+09:00
diff --git a/config/web-server/nginx/gunicorn/fastcgi/fastcgi_params b/config/web-server/nginx/gunicorn/fastcgi/fastcgi_params
diff --git a/config/web-server/nginx/gunicorn/nginx_conf.sh b/config/web-server/nginx/gunicorn/nginx_conf.sh
@@ -10,6 +10,6 @@ sed 's/account/'$account'/' sample_nginx.conf > $account'1'.temp
 sed 's/domain/'$domain'/g' $account'1'.temp > $account'2'.temp
 sed 's/portnumber;/'$portnumber';/' $account'2'.temp > $account'3'.temp
 sed 's/appname/'$appname'/' $account'3'.temp > $account'4'.temp
-sed 's/service_port/'$service_port'/' $account'4'.temp > ./sites-available/$account'_ng'.conf 
+sed 's/service_port/'$service_port'/' $account'4'.temp > ./pool.d/$account'_gunicorn_ng'.conf 
 
 rm *.temp
diff --git a/config/web-server/nginx/gunicorn/nginx_conf/nginx.conf b/config/web-server/nginx/gunicorn/nginx_conf/nginx.conf
@@ -62,5 +62,5 @@ http {
                 ;
 
     include /etc/nginx/conf.d/*.conf;
-    include /etc/nginx/sites-available/*.conf;
+    include /etc/nginx/pool.d/*.conf;
 }
diff --git a/config/web-server/nginx/gunicorn/nginx_https_conf.sh b/config/web-server/nginx/gunicorn/nginx_https_conf.sh
@@ -10,6 +10,6 @@ sed 's/account/'$account'/' sample_nginx_https.conf > $account'1'.temp
 sed 's/domain/'$domain'/g' $account'1'.temp > $account'2'.temp
 sed 's/portnumber;/'$portnumber';/' $account'2'.temp > $account'3'.temp
 sed 's/appname/'$appname'/' $account'3'.temp > $account'4'.temp
-sed 's/service_port/'$service_port'/' $account'4'.temp > ./sites-available/$account'_https_ng'.conf 
+sed 's/service_port/'$service_port'/' $account'4'.temp > ./pool.d/$account'_gunicorn_https_ng'.conf 
 
 rm *.temp
diff --git a/config/web-server/nginx/gunicorn/pool.d/README.md b/config/web-server/nginx/gunicorn/pool.d/README.md
@@ -0,0 +1,2 @@
+# docker_local_nginx_php-fpm
+virtual host, connect local db setting, configuration builder
diff --git a/config/web-server/nginx/gunicorn/pool.d/sample_php_ng.conf b/config/web-server/nginx/gunicorn/pool.d/sample_php_ng.conf
diff --git a/config/web-server/nginx/php/nginx_conf.sh b/config/web-server/nginx/php/nginx_conf.sh
@@ -10,6 +10,6 @@ sed 's/account/'$account'/' sample_nginx.conf > $account'1'.temp
 sed 's/domain/'$domain'/g' $account'1'.temp > $account'2'.temp
 sed 's/portnumber;/'$portnumber';/' $account'2'.temp > $account'3'.temp
 sed 's/appname/'$appname'/' $account'3'.temp > $account'4'.temp
-sed 's/service_port/'$service_port'/' $account'4'.temp > ./sites-available/$account'_ng'.conf 
+sed 's/service_port/'$service_port'/' $account'4'.temp > ./pool.d/$account'_ng'.conf 
 
 rm *.temp
diff --git a/config/web-server/nginx/php/nginx_conf/nginx.conf b/config/web-server/nginx/php/nginx_conf/nginx.conf
@@ -62,5 +62,5 @@ http {
                 ;
 
     include /etc/nginx/conf.d/*.conf;
-    include /etc/nginx/sites-available/*.conf;
+    include /etc/nginx/pool.d/*.conf;
 }
diff --git a/config/web-server/nginx/php/nginx_https_conf.sh b/config/web-server/nginx/php/nginx_https_conf.sh
@@ -10,6 +10,6 @@ sed 's/account/'$account'/' sample_nginx_https.conf > $account'1'.temp
 sed 's/domain/'$domain'/g' $account'1'.temp > $account'2'.temp
 sed 's/portnumber;/'$portnumber';/' $account'2'.temp > $account'3'.temp
 sed 's/appname/'$appname'/' $account'3'.temp > $account'4'.temp
-sed 's/service_port/'$service_port'/' $account'4'.temp > ./sites-available/$account'_https_ng'.conf 
+sed 's/service_port/'$service_port'/' $account'4'.temp > ./pool.d/$account'_https_ng'.conf 
 
 rm *.temp
diff --git a/config/web-server/nginx/php/pool.d/README.md b/config/web-server/nginx/php/pool.d/README.md
@@ -0,0 +1,2 @@
+# docker_local_nginx_php-fpm
+virtual host, connect local db setting, configuration builder
diff --git a/config/web-server/nginx/php/pool.d/sample_php_ng.conf b/config/web-server/nginx/php/pool.d/sample_php_ng.conf
@@ -1,6 +1,7 @@
 server {
     listen       80;
     server_name  sample.com www.sample.com;
+    root   /www/sample;
 
     server_tokens off;
 
@@ -13,39 +14,13 @@ server {
     #set same size as post_max_size(php.ini or php_admin_value).
     client_max_body_size 10M;
 
-    access_log /log/sample.python.com.access.log main;
-    error_log  /log/sample.python.com.error.log warn;
+    access_log /log/sample.com.access.log main;
+    error_log  /log/sample.com.error.log warn;
  
-    # Django media
-    location /media  {
-        internal;
-        gzip_static on;
-        expires max;
-        alias /www/py37/django_test/repo/media;  # your Django project's media files - amend as required
-        include /etc/nginx/mime.types;
-    }
-
-    location /static {
-        gzip_static on;
-        expires max;
-        alias /www/py37/django_test/repo/.static_root;  # your Django project's static files - amend as required
-        include /etc/nginx/mime.types;
-    }
-
     location / {
-        include uwsgi_params;
-        uwsgi_param Host $host;
-        uwsgi_param X-Real-IP $remote_addr;
-        uwsgi_param X-Forwarded-For $proxy_add_x_forwarded_for;
-        uwsgi_param X-Forwarded-Proto $http_x_forwarded_proto;
-
-	    uwsgi_read_timeout 300s;
-        uwsgi_connect_timeout 300s;
-		
-        #uwsgi_cache my_cache;          
-        uwsgi_pass uwsgi-app:8000;
+        index  index.php index.html;
     }
-
+ 
     # Allow Lets Encrypt Domain Validation Program
     location ^~ /.well-known/acme-challenge/ {
         allow all;
@@ -75,4 +50,35 @@ server {
         log_not_found off;
         access_log off;
     }
+
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico) {
+        access_log off;
+    }
+ 
+    # Block .php file inside upload folder. uploads(wp), files(drupal), data(gnuboard).
+    location ~* /(?:uploads|default/files|data)/.*\.php$ {
+        deny all;
+    }
+ 
+    # Add PHP handler
+    location ~ [^/]\.php(/|$) {
+        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+        if (!-f $document_root$fastcgi_script_name) {
+            return 404;
+        }
+        fastcgi_buffering on;
+        fastcgi_buffer_size 16k;
+
+        fastcgi_connect_timeout 600s;
+        fastcgi_send_timeout 600s;
+        fastcgi_read_timeout 600s;
+        fastcgi_pass app:9000;
+        fastcgi_index index.php;
+        fastcgi_buffers 64 16k; # default 8 4k
+
+        tcp_nopush off;
+        keepalive_requests 0;
+
+        include fastcgi_params;
+    }
 }
diff --git a/config/web-server/nginx/uwsgi/fastcgi/fastcgi_params b/config/web-server/nginx/uwsgi/fastcgi/fastcgi_params
diff --git a/config/web-server/nginx/uwsgi/nginx_conf.sh b/config/web-server/nginx/uwsgi/nginx_conf.sh
@@ -10,6 +10,6 @@ sed 's/account/'$account'/' sample_nginx.conf > $account'1'.temp
 sed 's/domain/'$domain'/g' $account'1'.temp > $account'2'.temp
 sed 's/portnumber;/'$portnumber';/' $account'2'.temp > $account'3'.temp
 sed 's/appname/'$appname'/' $account'3'.temp > $account'4'.temp
-sed 's/service_port/'$service_port'/' $account'4'.temp > ./sites-available/$account'_ng'.conf 
+sed 's/service_port/'$service_port'/' $account'4'.temp > ./pool.d/$account'_uwsgi_ng'.conf 
 
 rm *.temp
diff --git a/config/web-server/nginx/uwsgi/nginx_conf/nginx.conf b/config/web-server/nginx/uwsgi/nginx_conf/nginx.conf
@@ -62,7 +62,5 @@ http {
                 ;
 
     include /etc/nginx/conf.d/*.conf;
-    include /etc/nginx/sites-available/*.conf;
-
-    uwsgi_max_temp_file_size 20480m;
+    include /etc/nginx/pool.d/*.conf;
 }
diff --git a/config/web-server/nginx/uwsgi/nginx_https_conf.sh b/config/web-server/nginx/uwsgi/nginx_https_conf.sh
@@ -10,6 +10,6 @@ sed 's/account/'$account'/' sample_nginx_https.conf > $account'1'.temp
 sed 's/domain/'$domain'/g' $account'1'.temp > $account'2'.temp
 sed 's/portnumber;/'$portnumber';/' $account'2'.temp > $account'3'.temp
 sed 's/appname/'$appname'/' $account'3'.temp > $account'4'.temp
-sed 's/service_port/'$service_port'/' $account'4'.temp > ./sites-available/$account'_https_ng'.conf 
+sed 's/service_port/'$service_port'/' $account'4'.temp > ./pool.d/$account'_uwsgi_https_ng'.conf 
 
 rm *.temp
diff --git a/config/web-server/nginx/uwsgi/pool.d/README.md b/config/web-server/nginx/uwsgi/pool.d/README.md
@@ -0,0 +1,2 @@
+# docker_local_nginx_php-fpm
+virtual host, connect local db setting, configuration builder
diff --git a/config/web-server/nginx/uwsgi/pool.d/sample_php_ng.conf b/config/web-server/nginx/uwsgi/pool.d/sample_php_ng.conf
@@ -1,6 +1,7 @@
 server {
     listen       80;
     server_name  sample.com www.sample.com;
+    root   /www/sample;
 
     server_tokens off;
 
@@ -11,35 +12,15 @@ server {
     charset utf-8;
 
     #set same size as post_max_size(php.ini or php_admin_value).
-    client_max_body_size 20M;
+    client_max_body_size 10M;
 
-    access_log /log/sample.python.com.access.log main;
-    error_log  /log/sample.python.com.error.log warn;
+    access_log /log/sample.com.access.log main;
+    error_log  /log/sample.com.error.log warn;
  
-    # Django media
-    location /media  {
-        internal;
-        gzip_static on;
-        expires max;
-        alias /www/py37/django_test/repo/media;  # your Django project's media files - amend as required
-        include /etc/nginx/mime.types;
-    }
-
-    location /static {
-        gzip_static on;
-        expires max;
-        alias /www/py37/django_test/repo/.static_root;  # your Django project's static files - amend as required
-        include /etc/nginx/mime.types;
-    }
-
     location / {
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_pass http://gunicorn-app:8000;
+        index  index.php index.html;
     }
-
+ 
     # Allow Lets Encrypt Domain Validation Program
     location ^~ /.well-known/acme-challenge/ {
         allow all;
@@ -68,5 +49,36 @@ server {
     location = /robots.txt {
         log_not_found off;
         access_log off;
-    }    
+    }
+
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico) {
+        access_log off;
+    }
+ 
+    # Block .php file inside upload folder. uploads(wp), files(drupal), data(gnuboard).
+    location ~* /(?:uploads|default/files|data)/.*\.php$ {
+        deny all;
+    }
+ 
+    # Add PHP handler
+    location ~ [^/]\.php(/|$) {
+        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+        if (!-f $document_root$fastcgi_script_name) {
+            return 404;
+        }
+        fastcgi_buffering on;
+        fastcgi_buffer_size 16k;
+
+        fastcgi_connect_timeout 600s;
+        fastcgi_send_timeout 600s;
+        fastcgi_read_timeout 600s;
+        fastcgi_pass app:9000;
+        fastcgi_index index.php;
+        fastcgi_buffers 64 16k; # default 8 4k
+
+        tcp_nopush off;
+        keepalive_requests 0;
+
+        include fastcgi_params;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,5 @@ http {`
`62`	`62`	`;`
`63`	`63`
`64`	`64`	`include /etc/nginx/conf.d/*.conf;`
`65`		`- include /etc/nginx/sites-available/*.conf;`
	`65`	`+ include /etc/nginx/pool.d/*.conf;`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# docker_local_nginx_php-fpm`
	`2`	`+virtual host, connect local db setting, configuration builder`