From b0abf507bb8eb570328172b659ab072bc4b08634 Mon Sep 17 00:00:00 2001
From: Tomas Touceda <chiiph@leap.se>
Date: Wed, 15 May 2013 16:16:32 -0300
Subject: Integrate soledad and keymanager in the client

---
 src/leap/services/soledad/soledadspec.py | 57 ++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/leap/services/soledad/soledadspec.py

(limited to 'src/leap/services/soledad/soledadspec.py')

diff --git a/src/leap/services/soledad/soledadspec.py b/src/leap/services/soledad/soledadspec.py
new file mode 100644
index 00000000..d5a437cc
--- /dev/null
+++ b/src/leap/services/soledad/soledadspec.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# soledadspec.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+soledad_config_spec = {
+    'description': 'sample soledad service config',
+    'type': 'object',
+    'properties': {
+        'serial': {
+            'type': int,
+            'default': 1,
+            'required': True
+        },
+        'version': {
+            'type': int,
+            'default': 1,
+            'required': True
+        },
+        'hosts': {
+            'type': dict,
+            'default': {
+                "python": {
+                    "hostname": "someprovider",
+                    "ip_address": "1.1.1.1",
+                    "location": "loc",
+                    "port": 1111
+                },
+            },
+        },
+        'locations': {
+            'type': dict,
+            'default': {
+                "locations": {
+                    "ankara": {
+                        "country_code": "TR",
+                        "hemisphere": "N",
+                        "name": "loc",
+                        "timezone": "+0"
+                    }
+                }
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From dbb873016042b213dd9cd84a59aec0c0a2383691 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 5 Jun 2013 05:18:39 +0900
Subject: use twisted processProtocol instead of QProcess to drive openvpn

---
 src/leap/services/soledad/soledadspec.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/leap/services/soledad/soledadspec.py')

diff --git a/src/leap/services/soledad/soledadspec.py b/src/leap/services/soledad/soledadspec.py
index d5a437cc..8233d6a0 100644
--- a/src/leap/services/soledad/soledadspec.py
+++ b/src/leap/services/soledad/soledadspec.py
@@ -22,12 +22,12 @@ soledad_config_spec = {
         'serial': {
             'type': int,
             'default': 1,
-            'required': True
+            'required': ["True"]
         },
         'version': {
             'type': int,
             'default': 1,
-            'required': True
+            'required': ["True"]
         },
         'hosts': {
             'type': dict,
-- 
cgit v1.2.3