summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/common.json4
-rw-r--r--provider_base/services/openvpn.json2
-rw-r--r--provider_base/services/webapp.json7
3 files changed, 5 insertions, 8 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 6ad8a2e6..4a5406a0 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -75,12 +75,12 @@
"tapicero": {
"type": "git",
"source": "https://leap.se/git/tapicero",
- "revision": "origin/version/0.6.1"
+ "revision": "origin/version/0.7"
},
"webapp": {
"type": "git",
"source": "https://leap.se/git/leap_web",
- "revision": "origin/version/0.6.1"
+ "revision": "origin/version/0.7"
}
}
}
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 127f5890..11cb0dc2 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -25,7 +25,7 @@
"cipher": "AES-128-CBC",
"keepalive": "10 30",
"tun-ipv6": true,
- "fragment": 1400
+ "fragment": 1500
}
},
"obfsproxy": {
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index e80a758a..b0646579 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -4,11 +4,8 @@
"forbidden_usernames": ["admin", "administrator", "arin-admin", "certmaster", "contact", "info", "maildrop", "postmaster", "ssladmin", "www-data"],
"domain": "= domain.full_suffix",
"modules": ["user", "billing", "help"],
- "couchdb_webapp_user": {
- "username": "= global.services[:couchdb].couch.users[:webapp].username",
- "password": "= secret :couch_webapp_password",
- "salt": "= hex_secret :couch_webapp_password_salt, 128"
- },
+ "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
+ "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]",
"customization_dir": "= file_path 'webapp'",
"client_certificates": "= provider.ca.client_certificates",
"allow_limited_certs": "= provider.service.allow_limited_bandwidth",