merge

sites:
  apidoc:
    scheme: http
    host: apidoctest.elephone.vb
  api:
    scheme: http
    host: api.elephone.vb

nginx_sites:
<<<<<<< HEAD
  - server: 
      template: site
      file_name: {{ sites.apidoc.host }}
      listen: 80
      server_name: "{{ sites.apidoc.host }}"
      root: "/var/www/api.elephone.vb/docs/build/html"
      location:
        - name: "/"
          try_files: "$uri $uri/ /index.html"

  - server:
      template: site
      file_name: api.elephone.vb
      listen: 80
      server_name: "{{ sites.api.host }}"
      root: "/var/www/api.elephone.vb/src/public"
      location:
        - name: "/"
          try_files: "$uri $uri/ /index.php$is_args$args"
          index: index.php
        - name: '~ \.php$'
          try_files: "$uri =404"
          fastcgi_split_path_info: '^(.+\.php)(/.+)$'
          fastcgi_pass: "unix:/var/run/php5-fpm.sock"
          fastcgi_index: "index.php"
          include: "fastcgi_params"
          fastcgi_param:
            - "SCRIPT_FILENAME $document_root$fastcgi_script_name"
            - "PHP_VALUE \"auto_prepend_file=/var/www/xhgui/external/header.php\""
=======
  - server:
      template: site
      file_name: apidocs
      listen: 80
      server_name: "{{sites.apidoc.host}}"
      root: "/vagrant/docs/build/html"
      log_postdata: False
      location1: 
        name: "/"
        try_files: "$uri $uri/ /index.html"
      location2: 
        name: "/images/"
        try_files: "$uri $uri/ /index.html"
  - server:
      template: site
      file_name: api
      listen: 80
      server_name: "{{sites.api.host}}"
      root: "/vagrant/src/public"
      log_postdata: False
      location1: 
        name: "/"
        try_files: "$uri $uri/ /index.php$is_args$args" 
        index: index.php 
      location2: 
        name: '~ \.php$'
        try_files: "$uri =404"
        fastcgi_split_path_info: '^(.+\.php)(/.+)$'
        fastcgi_pass: "unix:/var/run/php5-fpm.sock"
        fastcgi_index: "index.php"
        include: "fastcgi_params"
        fastcgi_param: "SCRIPT_FILENAME $document_root$fastcgi_script_name"
>>>>>>> ca0f90527282bb3947f398365d45b697799b283f