bentruyman

server {
  listen   80;
  server_name  my-server.com;

  access_log  /var/log/nginx/my-server.com-access.log;
  error_log   /var/log/nginx/my-server.com-error.log;

  root   /var/www/my-server.com/public;

  index           index.php index.html;

jhass

# Make sure to notice the comments at https://gist.github.com/jhass/719014#gistcomment-19774

<VirtualHost *:80>
  ServerName diaspora.example.org
  ServerAlias www.diaspora.example.org
  
  RedirectPermanent / https://diaspora.example.org/
</VirtualHost>
<VirtualHost *:443>
 ServerName diaspora.example.org