added and edited some configs for the aa-statistics script

dockerfiles/Dockerfile.nginx

@@ -35,7 +35,7 @@ ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US.UTF-8
 
 # build nginx
-RUN apt-get install -y zlib1g zlib1g-dev libpcre3 libpcre3-dev curl
+RUN apt-get install -y zlib1g zlib1g-dev libpcre3 libpcre3-dev curl php-fpm
 RUN cpanm File::Spec::Functions
 RUN cpanm Term::ReadLine
 COPY commul-customization/nginx_build.sh /tmp/nginx_build.sh
@@ -59,6 +59,7 @@ COPY commul-customization/shib_test.pl /opt/nginx/html/secure/
 # copy over aa-statistics script
 RUN mkdir /opt/nginx/html/php
 COPY commul-customization/aa-statistics.php /opt/nginx/html/php/
+
 # get aai project
 RUN apt-get install -y git
 RUN git clone https://github.com/ufal/lindat-aai-discovery.git /opt/repository/sources/lindat-aai-discovery
@@ -78,6 +79,11 @@ RUN apt-get install -y python-setuptools
 RUN easy_install supervisor
 COPY commul-customization/supervisord.conf /etc/
 RUN mkdir -p /var/log/supervisor
+# create dirs for php-fpm socket/pid and log files
+RUN mkdir -p /run/php
+RUN mkdir -p /var/log/php-fpm/
+COPY commul-customization/php-fpm.conf /etc/php/7.0/fpm/
+COPY commul-customization/php.ini /etc/php/7.0/fpm/
 
 # copy over config files
 COPY commul-customization/default-ssl /opt/nginx/conf/

dockerfiles/commul-customization/default-ssl

@@ -82,15 +82,15 @@ server {
 
 #    try_files $uri $uri/ /index.php?$args;
 
-#    location ~ \.php$ {
-#      include process_php;
-#    }
   }
 
   location /php/aa-statistics.php {
-     shib_request /shibauthorizer;
-#     include proxy_params;
-     proxy_pass http://localhost:8080;
+      shib_request /shibauthorizer;
+      fastcgi_pass unix:/run/php/php7.0-fpm.sock;
+      fastcgi_param  SCRIPT_FILENAME /opt/nginx/html$fastcgi_script_name;
+      fastcgi_param  PATH_INFO $fastcgi_script_name;
+      fastcgi_split_path_info ^(.+\.php)(/.+)$;
+      include fastcgi_params;
    }
 
   location /repository {

dockerfiles/commul-customization/php-fpm.conf

+;;;;;;;;;;;;;;;;;;;;;
+; FPM Configuration ;
+;;;;;;;;;;;;;;;;;;;;;
+
+; All relative paths in this configuration file are relative to PHP's install
+; prefix (/usr). This prefix can be dynamically changed by using the
+; '-p' argument from the command line.
+
+;;;;;;;;;;;;;;;;;;
+; Global Options ;
+;;;;;;;;;;;;;;;;;;
+
+[global]
+; Pid file
+; Note: the default prefix is /var
+; Default Value: none
+pid = /run/php/php7.0-fpm.pid
+
+; Error log file
+; If it's set to "syslog", log is sent to syslogd instead of being written
+; in a local file.
+; Note: the default prefix is /var
+; Default Value: log/php-fpm.log
+error_log = /var/log/php7.0-fpm.log
+
+; syslog_facility is used to specify what type of program is logging the
+; message. This lets syslogd specify that messages from different facilities
+; will be handled differently.
+; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
+; Default Value: daemon
+;syslog.facility = daemon
+
+; syslog_ident is prepended to every message. If you have multiple FPM
+; instances running on the same server, you can change the default value
+; which must suit common needs.
+; Default Value: php-fpm
+;syslog.ident = php-fpm
+
+; Log level
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
+;log_level = notice
+
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
+;emergency_restart_threshold = 0
+
+; Interval of time used by emergency_restart_interval to determine when
+; a graceful restart will be initiated.  This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;emergency_restart_interval = 0
+
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;process_control_timeout = 0
+
+; The maximum number of processes FPM will fork. This has been design to control
+; the global number of processes when using dynamic PM within a lot of pools.
+; Use it with caution.
+; Note: A value of 0 indicates no limit
+; Default Value: 0
+; process.max = 128
+
+; Specify the nice(2) priority to apply to the master process (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool process will inherit the master process priority
+;         unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
+daemonize = no
+
+; Set open file descriptor rlimit for the master process.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit for the master process.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Specify the event mechanism FPM will use. The following is available:
+; - select     (any POSIX os)
+; - poll       (any POSIX os)
+; - epoll      (linux >= 2.5.44)
+; - kqueue     (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
+; - /dev/poll  (Solaris >= 7)
+; - port       (Solaris >= 10)
+; Default Value: not set (auto detection)
+;events.mechanism = epoll
+
+; When FPM is build with systemd integration, specify the interval,
+; in second, between health report notification to systemd.
+; Set to 0 to disable.
+; Available Units: s(econds), m(inutes), h(ours)
+; Default Unit: seconds
+; Default value: 10
+;systemd_interval = 10
+
+;;;;;;;;;;;;;;;;;;;;
+; Pool Definitions ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Multiple pools of child processes may be started with different listening
+; ports and different management options.  The name of the pool will be
+; used in logs and stats. There is no limitation on the number of pools which
+; FPM can handle. Your system will tell you anyway :)
+
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+; Relative path can also be used. They will be prefixed by:
+;  - the global prefix if it's been set (-p argument)
+;  - /usr otherwise
+include=/etc/php/7.0/fpm/pool.d/*.conf

dockerfiles/commul-customization/shibboleth2.xml

@@ -26,7 +26,7 @@
         <Host name="clarin-dev.eurac.edu"
                 authType="shibboleth"
                 requireSession="true"
-				exportAssertion="true"
+		exportAssertion="true"
                 redirectToSSL="443">
             <Path name="/secure" />
         </Host>
@@ -37,7 +37,7 @@
     <!-- The ApplicationDefaults element is where most of Shibboleth's SAML bits are defined. -->
     <ApplicationDefaults entityID="https://clarin-dev.eurac.edu/Shibboleth.sso/Metadata"
                          REMOTE_USER="eppn persistent-id targeted-id"
-						 sessionHook="/php/aa-statistics.php"
+			 sessionHook="/php/aa-statistics.php"
                          cipherSuites="ECDHE+AESGCM:ECDHE:!aNULL:!eNULL:!LOW:!EXPORT:!RC4:!SHA:!SSLv2">
 
         <!--
@@ -50,12 +50,12 @@
         security of your site. Stealing sessions via cookie theft is much easier with this disabled.
         -->
         <Sessions lifetime="28800"
-				  timeout="3600"
-				  relayState="ss:mem"
+		  timeout="3600"
+		  relayState="ss:mem"
                   checkAddress="false"
                   handlerSSL="false"
-				  cookieProps="http"
-				  exportLocation="/GetAssertion"
+		  cookieProps="http"
+		  exportLocation="/GetAssertion"
                   exportACL="127.0.0.1">
 
             <!--

dockerfiles/commul-customization/supervisord.conf

@@ -75,6 +75,15 @@ user=www-data
 stdout_logfile=/var/log/supervisor/shibresponder.log
 stderr_logfile=/var/log/supervisor/shibresponder.error.log
 
+[program:php-fpm]
+command=/usr/sbin/php-fpm7.0 -c /etc/php/7.0/fpm/php-fpm.conf
+autostart=true
+autorestart=unexpected
+stdout_logfile=/var/log/php-fpm/stdout.log
+stdout_logfile_maxbytes=0
+stderr_logfile=/var/log/php-fpm/stderr.log
+stderr_logfile_maxbytes=0
+exitcodes=0
 
 
 [program:nginx]