Fixed list sorting

Marius Cramer

2013-11-14 7d52e00a51450bc4a080d4e21b7dda02c0a65191

 server/conf/vhost.conf.master

@@ -13,7 +13,11 @@
   <tmpl_if name='php' op='==' value='cgi'>
      DocumentRoot <tmpl_var name='web_document_root'>
   </tmpl_else>
      <tmpl_if name='php' op='==' value='php-fpm'>
      DocumentRoot <tmpl_var name='web_document_root'>
      </tmpl_else>
      DocumentRoot <tmpl_var name='web_document_root_www'>
      </tmpl_if>
   </tmpl_if>
</tmpl_if>

@@ -197,12 +201,13 @@
            FcgidIdleTimeout 300
            FcgidProcessLifeTime 3600
            # FcgidMaxProcesses 1000
            FcgidMaxRequestsPerProcess <tmpl_var name='fastcgi_max_requests'>
            FcgidMinProcessesPerClass 0
            FcgidMaxProcessesPerClass 100
            FcgidConnectTimeout 3
            FcgidIOTimeout 360
            FcgidBusyTimeout 300
      FcgidMaxRequestLen 1073741824
            FcgidMaxRequestLen 1073741824
<tmpl_else>
            IdleTimeout 300
            ProcessLifeTime 3600
@@ -233,18 +238,18 @@
</tmpl_if>
<tmpl_if name='php' op='==' value='php-fpm'>
      <IfModule mod_fastcgi.c>
            <Directory /usr/lib/cgi-bin>
            <Directory {tmpl_var name='document_root'}/cgi-bin>
                  Order allow,deny
                  Allow from all
             </Directory>
                AddHandler php5-fcgi .php
                Action php5-fcgi /php5-fcgi
            Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}
            Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
<tmpl_if name='use_tcp'>
                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'} -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
</tmpl_if>
<tmpl_if name='use_socket'>
                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'} -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
</tmpl_if>
      </IfModule>
</tmpl_if>
@@ -252,16 +257,20 @@
<tmpl_if name="rewrite_enabled">
      RewriteEngine on
<tmpl_if name='seo_redirect_enabled'>
      RewriteCond %{HTTP_HOST} ^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
      RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
      RewriteCond %{HTTP_HOST} <tmpl_var name='seo_redirect_operator'>^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
      RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_if>
<tmpl_loop name="alias_seo_redirects">
      RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC]
      RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_loop>
<tmpl_loop name="redirects">
      RewriteCond %{HTTP_HOST}   <tmpl_var name='rewrite_domain'>$ [NC]
<tmpl_if name="rewrite_is_url" op="==" value="n">
      RewriteCond %{REQUEST_URI} !^/webdav/
      RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
</tmpl_if>
      RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'>$1  <tmpl_var name='rewrite_type'>
      RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if>  <tmpl_var name='rewrite_type'>
</tmpl_loop>
</tmpl_if>