dalesze prace

images/php-fpm/start.sh

@@ -18,8 +18,10 @@ echo "\$APP_USER  :: $APP_USER"
 echo "\$APP_GROUP :: $APP_GROUP"
 
 # log and run
-mkdir -p /var/log/php-fpm && chown $APP_USER:$APP_GROUP /var/log/php-fpm
-mkdir -p /var/run/php-fpm && chown $APP_USER:$APP_GROUP /var/run/php-fpm
+mkdir -p /var/log/php-fpm
+mkdir -p /var/run/php-fpm
+chown $APP_USER:$APP_GROUP /var/log/php-fpm
+chown $APP_USER:$APP_GROUP /var/run/php-fpm
 
 # php.ini customizations.
 sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 10M/g" /etc/php5/fpm/php.ini

setup.sh

@@ -57,6 +57,7 @@ sudo mkdir "$static_data_dir/data/php-fpm/frontend"
 sudo mkdir "$static_data_dir/data/php-fpm/rest"
 sudo mkdir "$static_data_dir/data/php-fpm/pgadmin"
 sudo mkdir "$static_data_dir/data/php-fpm/ldapadmin"
+sudo rsync -av static_data/data/ "$static_data_dir/data/"
 
 # configs if needed
 if [ ! -e "$static_data_dir/configs" ]; then
@@ -110,21 +111,24 @@ docker rm -v $cnt_postgres $cnt_nginx_public $cnt_nginx_internal $cnt_phpfpm_fro
 # - publiczny
 docker run -d \
  -v "$static_data_dir/configs/nginx-public/":/etc/nginx/sites-enabled:ro \
- -v "$static_data_dir/logs/nginx-public/"/var/log/nginx/ \
+ -v "$static_data_dir/logs/nginx-public/":/var/log/nginx/ \
  -v "$static_data_dir/run/php-fpm/":/var/run/php-fpm/ \
+ -v "$static_data_dir/data/php-fpm/":/opt/php/ \
  --name $cnt_nginx_public \
  $img_nginx
 # - wewnętrzny
 docker run -d \
  -v "$static_data_dir/configs/nginx-internal/":/etc/nginx/sites-enabled:ro \
- -v "$static_data_dir/logs/nginx-internal/"/var/log/nginx/ \
+ -v "$static_data_dir/logs/nginx-internal/":/var/log/nginx/ \
  -v "$static_data_dir/run/php-fpm/":/var/run/php-fpm/ \
+ -v "$static_data_dir/data/php-fpm/":/opt/php/ \
  --name $cnt_nginx_internal \
  $img_nginx
 
 # a teraz php-fpmy!
 # - frontend
 docker run -d \
+ -v "$static_data_dir/data/php-fpm/frontend/":/opt/php/frontend/ \
  -v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
  -v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
  -e "APP_NAME=frontend" \
@@ -132,6 +136,7 @@ docker run -d \
  $img_phpfpm
 # - rest
 docker run -d \
+-v "$static_data_dir/data/php-fpm/rest/":/opt/php/rest/ \
  -v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
  -v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
  -e "APP_NAME=rest" \
@@ -139,6 +144,7 @@ docker run -d \
  $img_phpfpm
 # - pgadmin
 docker run -d \
+ -v "$static_data_dir/data/php-fpm/pgadmin/":/opt/php/pgadmin/ \
  -v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
  -v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
  -e "APP_NAME=pgadmin" \
@@ -146,6 +152,7 @@ docker run -d \
  $img_phpfpm
 # - ldapadmin
 #docker run -d \
+# -v "$static_data_dir/data/php-fpm/ldapadmin/":/opt/php/ldapadmin/ \
 # -v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
 # -v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
 # -e "APP_NAME=ldapadmin" \

static_data/configs/nginx-internal/000-rest.conf

@@ -6,7 +6,9 @@ server {
 
   listen 80;
   server_name rest;
-  root /opt/php/rest;
+  root /opt/php/$server_name;
+  access_log /var/log/nginx/$server_name-access.log;
+  error_log /var/log/nginx/$server_name-error.log;
   
   location / {
     index index.html index.htm index.php;
@@ -17,7 +19,7 @@ server {
   location ~ \.php$ {
     try_files $uri =404;
     proxy_read_timeout 1200;
-    fastcgi_pass unix:/var/run/php-fpm/rest-php5-fpm.sock;
+    fastcgi_pass unix:/var/run/php-fpm/$server_name-php5-fpm.sock;
     fastcgi_index index.php;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     include fastcgi_params;

static_data/configs/nginx-internal/001-pgadmin.conf

@@ -6,7 +6,9 @@ server {
 
   listen 80;
   server_name pgadmin;
-  root /opt/php/pgadmin;
+  root /opt/php/$server_name;
+  access_log /var/log/nginx/$server_name-access.log;
+  error_log /var/log/nginx/$server_name-error.log;
   
   location / {
     index index.html index.htm index.php;
@@ -17,7 +19,7 @@ server {
   location ~ \.php$ {
     try_files $uri =404;
     proxy_read_timeout 1200;
-    fastcgi_pass unix:/var/run/php-fpm/pgadmin-php5-fpm.sock;
+    fastcgi_pass unix:/var/run/php-fpm/$server_name-php5-fpm.sock;
     fastcgi_index index.php;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     include fastcgi_params;

static_data/configs/nginx-internal/002-ldapadmin.conf

@@ -6,7 +6,9 @@ server {
 
   listen 80;
   server_name ldapadmin;
-  root /opt/php/ldapadmin;
+  root /opt/php/$server_name;
+  access_log /var/log/nginx/$server_name-access.log;
+  error_log /var/log/nginx/$server_name-error.log;
   
   location / {
     index index.html index.htm index.php;
@@ -17,7 +19,7 @@ server {
   location ~ \.php$ {
     try_files $uri =404;
     proxy_read_timeout 1200;
-    fastcgi_pass unix:/var/run/php-fpm/ldapadmin-php5-fpm.sock;
+    fastcgi_pass unix:/var/run/php-fpm/$server_name-php5-fpm.sock;
     fastcgi_index index.php;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     include fastcgi_params;

static_data/configs/nginx-public/000-frontend.conf

@@ -6,6 +6,8 @@ server {
 
   listen 80 default_server;
   root /opt/php/frontend;
+  access_log /var/log/nginx/frontend-access.log;
+  error_log /var/log/nginx/frontend-error.log;
   
   location / {
     index index.html index.htm index.php;

static_data/data/php-fpm/frontend/index.php

@@ -0,0 +1,4 @@
+<h1>PHP-FPM: frontend</h1>
+<?php
+        echo phpinfo();
+?>

static_data/data/php-fpm/ldapadmin/index.php

@@ -0,0 +1,4 @@
+<h1>PHP-FPM: ldapadmin</h1>
+<?php
+        echo phpinfo();
+?>

static_data/data/php-fpm/pgadmin/index.php

@@ -0,0 +1,4 @@
+<h1>PHP-FPM: pgadmin</h1>
+<?php
+        echo phpinfo();
+?>

static_data/data/php-fpm/rest/index.php

@@ -0,0 +1,4 @@
+<h1>PHP-FPM: rest</h1>
+<?php
+        echo phpinfo();
+?>