Merge branch 'master' of github.com:EGroupware/egroupware

This commit is contained in:
nathangray 2019-07-11 10:57:39 -06:00
commit 5a1ce9c706

View File

@ -72,6 +72,25 @@ server {
# include fastcgi_params;
#}
# phpmyadmin in /usr/share/phpmyadmin
#location /phpmyadmin {
# alias /usr/share/phpmyadmin/;
# try_files $uri $uri/ =404;
# location ~ ^/phpmyadmin(/(?U).+\.php) {
# alias /usr/share/phpmyadmin;
# fastcgi_pass unix:/run/php/php7.0-fpm.sock;
# fastcgi_index index.php;
# fastcgi_split_path_info ^((?U).+\.php)(.*)$;
# fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
# fastcgi_param PATH_INFO $fastcgi_path_info;
# fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
# # standard Nginx
# include fastcgi_params;
# fastcgi_param DOCUMENT_ROOT /var/www/html;
# fastcgi_param SCRIPT_FILENAME /usr/share/phpmyadmin$1;
# }
#}
# ActiveSync support
location /Microsoft-Server-ActiveSync {
fastcgi_pass unix:/run/php/php7.0-fpm.sock;