diff --git a/build/configs/apache2/dav.mydomain.com b/build/configs/apache2/dav.mydomain.com new file mode 100644 index 000000000..9d30299df --- /dev/null +++ b/build/configs/apache2/dav.mydomain.com @@ -0,0 +1,16 @@ + + + AcceptPathInfo On + ServerName dav.mydomain.com + DocumentRoot /var/www/mydomain.com + + RewriteEngine On + RewriteRule /.well-known/carddav /index.php/dav [R,L] + + + Options None + Options +FollowSymlinks + AllowOverride All + + + \ No newline at end of file diff --git a/build/configs/apache2/mydomain.com b/build/configs/apache2/mydomain.com new file mode 100644 index 000000000..f4dda9f14 --- /dev/null +++ b/build/configs/apache2/mydomain.com @@ -0,0 +1,16 @@ + + + AcceptPathInfo On + ServerName mydomain.com + DocumentRoot /var/www/mydomain.com + + RewriteEngine On + RewriteRule /.well-known/carddav /index.php/dav [R,L] + + + Options None + Options +FollowSymlinks + AllowOverride All + + + \ No newline at end of file diff --git a/build/configs/nginx.domain.example.conf b/build/configs/nginx.domain.example.conf deleted file mode 100644 index 9b6b4333c..000000000 --- a/build/configs/nginx.domain.example.conf +++ /dev/null @@ -1,65 +0,0 @@ - -server { - listen 80; - server_name domain.com; - - root /var/www/domain.com; - index index.php index.html; - - log_not_found off; - charset utf-8; - - error_log /var/log/nginx/domain.com-error.log; - - location = /favicon.ico { access_log off; log_not_found off; } - location = /robots.txt { access_log off; log_not_found off; } - location ~ /\.ht { deny all; } - - location ^~ /data { - deny all; - return 404; - } - - rewrite ^/.well-known/carddav /index.php/dav/ redirect; - - location ~ ^(.+\.php)(.*)$ { - include fastcgi_params; - fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$; - fastcgi_pass 127.0.0.1:9000; -# fastcgi_pass unix:/var/run/php5-fpm.sock; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - } -} - -# optional -server { - listen 80; - server_name dav.domain.com; - - rewrite ^/.well-known/carddav / redirect; - - root /var/www/domain.com; - index index.php index.html; - - log_not_found off; - charset utf-8; - - error_log /var/log/nginx/dav.domain.com-error.log; - - location = /favicon.ico { access_log off; log_not_found off; } - location = /robots.txt { access_log off; log_not_found off; } - location ~ /\.ht { deny all; } - - rewrite ^/.well-known/carddav / redirect; - rewrite ^(.*)$ /index.php/dav$1 last; - - location ~ ^(.+\.php)(.*)$ { - include fastcgi_params; - fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$; - fastcgi_pass 127.0.0.1:9000; -# fastcgi_pass unix:/var/run/php5-fpm.sock; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - } -} \ No newline at end of file diff --git a/build/configs/nginx/dav.mydomain.com.conf b/build/configs/nginx/dav.mydomain.com.conf new file mode 100644 index 000000000..6c27bca25 --- /dev/null +++ b/build/configs/nginx/dav.mydomain.com.conf @@ -0,0 +1,41 @@ + +server { + listen 80; + server_name dav.mydomain.com; + + root /var/www/mydomain.com; + access_log /var/log/nginx/dav.mydomain.com.access.log main; + error_log /var/log/nginx/dav.mydomain.com.error.log; + + index index.php; + charset utf-8; + log_not_found off; + + location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { + expires max; + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + location = /favicon.ico { access_log off; log_not_found off; } + location = /robots.txt { access_log off; log_not_found off; } + location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; } + location ^~ /data { access_log off; log_not_found off; deny all; return 404; } + + rewrite ^/.well-known/carddav / redirect; + rewrite ^(.*)$ /index.php/dav$1 last; + + location ~ /index\.php/dav/.*$ { + include fastcgi_params; + + fastcgi_pass 127.0.0.1:9000; +# fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + + fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$; + fastcgi_index index.php; + fastcgi_param SCRIPT_NAME index.php; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; + } +} diff --git a/build/configs/nginx/mydomain.com.conf b/build/configs/nginx/mydomain.com.conf new file mode 100644 index 000000000..4e55f3f90 --- /dev/null +++ b/build/configs/nginx/mydomain.com.conf @@ -0,0 +1,47 @@ + +server { + listen 80; + server_name mydomain.com; + + root /var/www/mydomain.com; + access_log /var/log/nginx/mydomain.com.access.log main; + error_log /var/log/nginx/mydomain.com.error.log; + + index index.php index.html; + charset utf-8; + log_not_found off; + + location ~* \.(?:ico|css|js|gif|jpe?g|png)$ { + expires max; + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + location = /favicon.ico { access_log off; log_not_found off; } + location = /robots.txt { access_log off; log_not_found off; } + location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; } + location ^~ /data { access_log off; log_not_found off; deny all; return 404; } + + rewrite ^/.well-known/carddav /index.php/dav/ redirect; + + location ~ /index\.php/dav/.*$ { + include fastcgi_params; + + fastcgi_pass 127.0.0.1:9000; +# fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + + fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$; + fastcgi_index index.php; + fastcgi_param SCRIPT_NAME index.php; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; + } + + location ~ \.php { + include fastcgi_params; + fastcgi_pass 127.0.0.1:9000; +# fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } +}