cleanup travis script and naming of varnish config

Author: dbu

.travis.yml

@@ -30,14 +30,15 @@ install:
 before_script:
   # Install Varnish
   - |
+    set -e
     if [ "$VARNISH_VERSION" = "5.0.0" ]; then
       wget https://repo.varnish-cache.org/pkg/${VARNISH_VERSION}/varnish_${VARNISH_VERSION}-1_amd64.deb
       sudo dpkg -i varnish_${VARNISH_VERSION}-1_amd64.deb
       sudo apt-get update -qq
       sudo apt-get -f install
     else
       curl http://repo.varnish-cache.org/debian/GPG-key.txt | sudo apt-key add -
-      echo "deb http://repo.varnish-cache.org/ubuntu/ precise varnish-${VARNISH_VERSION}" | sudo tee -a /etc/apt/sources.list
+      echo "deb https://repo.varnish-cache.org/ubuntu/ trusty varnish-${VARNISH_VERSION}" | sudo tee -a /etc/apt/sources.list
       sudo apt-get update -qq
       sudo apt-get install -qq varnish
     fi

doc/_static/tabs.css

@@ -25,7 +25,7 @@ div.configuration-block ul.simple li.selected a {
     color: white;
 }
 
-div.highlight-varnish3, div.highlight-varnish4 {
+div.highlight-varnish3, div.highlight-varnish {
     border: none !important;
 }
 
@@ -55,10 +55,10 @@ div.highlight pre {
     color: white !important;
 }
 
-div.highlight pre span.n, 
-div.highlight pre span.na, 
-div.highlight pre span.nb, 
-div.highlight pre span.nc, 
+div.highlight pre span.n,
+div.highlight pre span.na,
+div.highlight pre span.nb,
+div.highlight pre span.nc,
 div.highlight pre span.nf,
 div.highlight pre span.nx,
 div.highlight pre span.kn {
@@ -74,8 +74,8 @@ div.highlight pre span.k, div.highlight pre span.o {
 }
 
 div.highlight pre span.mi,
-div.highlight pre span.s, 
-div.highlight pre span.s1, 
+div.highlight pre span.s,
+div.highlight pre span.s1,
 div.highlight pre span.s2,
 div.highlight pre span.sr {
     color: #56db3a;

doc/conf.py

@@ -9,7 +9,7 @@
 
 lexers['php'] = PhpLexer(startinline=True, linenos=1)
 lexers['varnish3'] = CLexer()
-lexers['varnish4'] = CLexer()
+lexers['varnish'] = CLexer()
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 if not on_rtd:  # only import and set the theme if we're building docs locally
@@ -263,5 +263,5 @@ def setup(app):
 
 config_block = {
     'varnish3': 'Varnish 3',
-    'varnish4': 'Varnish 4 & 5'
+    'varnish': 'Varnish 4 & 5'
 }

doc/varnish-configuration.rst

@@ -16,7 +16,7 @@ which IPs are allowed to issue invalidation requests. To use the provided
 configuration fragments, this ACL has to be named ``invalidators``. The most
 simple ACL, valid for all Varnish versions from 3 onwards, looks as follows:
 
-.. code-block:: varnish4
+.. code-block:: varnish
 
     # /etc/varnish/your_varnish.vcl
 
@@ -59,7 +59,7 @@ To enable support add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_purge.vcl";
 
@@ -100,7 +100,7 @@ To enable support, add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_refresh.vcl";
 
@@ -129,7 +129,7 @@ To enable support add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_ban.vcl";
 
@@ -186,7 +186,7 @@ VCL will look like this:
 .. configuration-block::
 
     .. literalinclude:: ../resources/config/varnish/fos_ban.vcl
-        :language: varnish4
+        :language: varnish
         :emphasize-lines: 17-22,49-50
         :linenos:
 
@@ -210,7 +210,7 @@ To enable support add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_user_context.vcl";
         include "path-to-config/varnish/fos_user_context_url.vcl";
@@ -294,7 +294,7 @@ To make the hash request cacheable, you must extract a stable user session id
 *before* calling ``fos_user_context_recv``. You can do this as
 `explained in the Varnish documentation`_:
 
-.. code-block:: varnish4
+.. code-block:: varnish
     :linenos:
 
     sub vcl_recv {
@@ -329,7 +329,7 @@ inline C enabled: ``-p vcc_allow_inline_c=on``. Then add the following to
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_custom_ttl.vcl";
 
@@ -362,7 +362,7 @@ To enable support add the following to ``your_varnish.vcl``:
 
 .. configuration-block::
 
-    .. code-block:: varnish4
+    .. code-block:: varnish
 
         include "path-to-config/varnish/fos_debug.vcl";