From 374a68a2d63b66d23a69b7922dea27b4d2a008c3 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 24 Nov 2014 14:26:48 -0800
Subject: remove custom webapp version pin

---
 hiera/chameleon.yaml             |  2 +-
 hiera/elephant.yaml              |  2 +-
 hiera/snail.yaml                 |  1 +
 services/webapp.development.json |  8 ++++----
 services/webapp.json             | 10 +++++-----
 services/webapp.unstable.json    |  8 ++++----
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index ffccfeb..ff1add9 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -589,7 +589,7 @@ webapp:
     - ssladmin
     - www-data
   git: 
-    revision: origin/develop
+    revision: origin/version/0.6
     source: "https://leap.se/git/leap_web"
   modules: 
     - billing
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index df601fe..184483e 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -331,7 +331,7 @@ webapp:
     - ssladmin
     - www-data
   git: 
-    revision: origin/develop
+    revision: origin/version/0.6
     source: "https://leap.se/git/leap_web"
   modules: 
     - billing
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 2413ec0..21bd4d0 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -37,6 +37,7 @@ openvpn:
   configuration: 
     auth: SHA1
     cipher: AES-128-CBC
+    fragment: 1500
     keepalive: "10 30"
     tls-cipher: DHE-RSA-AES128-SHA
     tun-ipv6: true
diff --git a/services/webapp.development.json b/services/webapp.development.json
index 9275231..8b70f77 100644
--- a/services/webapp.development.json
+++ b/services/webapp.development.json
@@ -1,8 +1,8 @@
 {
   "webapp": {
-    "git": {
-      "source": "https://leap.se/git/leap_web",
-      "revision": "origin/develop"
-    }
+  //  "git": {
+  //    "source": "https://leap.se/git/leap_web",
+  //    "revision": "origin/develop"
+  //  }
   }
 }
diff --git a/services/webapp.json b/services/webapp.json
index 7faeb93..9bee3f2 100644
--- a/services/webapp.json
+++ b/services/webapp.json
@@ -1,9 +1,9 @@
 {
   "webapp": {
-    "admins": ["elijah", "varac", "micah", "kwadronaut", "mcnair", "meanderingcode", "azul"],
-    "git": {
-      "source": "https://leap.se/git/leap_web",
-      "revision": "origin/master"
-    }
+    "admins": ["elijah", "varac", "micah", "kwadronaut", "mcnair", "meanderingcode", "azul"]
+    //"git": {
+    //  "source": "https://leap.se/git/leap_web",
+    //  "revision": "origin/master"
+    //}
   }
 }
diff --git a/services/webapp.unstable.json b/services/webapp.unstable.json
index 9275231..86f212e 100644
--- a/services/webapp.unstable.json
+++ b/services/webapp.unstable.json
@@ -1,8 +1,8 @@
 {
   "webapp": {
-    "git": {
-      "source": "https://leap.se/git/leap_web",
-      "revision": "origin/develop"
-    }
+    //"git": {
+    //  "source": "https://leap.se/git/leap_web",
+    //  "revision": "origin/develop"
+    //}
   }
 }
-- 
cgit v1.2.3