summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/leap_mx50
-rw-r--r--[-rwxr-xr-x]pkg/leap_mx.tac (renamed from pkg/mx.tac)0
-rw-r--r--pkg/requirements.pip8
-rw-r--r--pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pubbin2779 -> 0 bytes
-rw-r--r--pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.secbin5453 -> 0 bytes
-rw-r--r--pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pubbin2779 -> 0 bytes
-rw-r--r--pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.secbin5453 -> 0 bytes
-rw-r--r--pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pubbin2779 -> 0 bytes
-rw-r--r--pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.secbin5453 -> 0 bytes
-rw-r--r--pkg/utils/gpg-keys/gpg-batch-key-script45
10 files changed, 5 insertions, 98 deletions
diff --git a/pkg/leap_mx b/pkg/leap_mx
deleted file mode 100644
index da8a3c8..0000000
--- a/pkg/leap_mx
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-pidfile=/var/run/leap_mx.pid \
-rundir=/var/lib/leap_mx/ \
-file=/usr/local/bin/mx.tac \
-logfile=/var/log/leap_mx.log
-
-[ -r /etc/default/leap_mx ] && . /etc/default/leap_mx
-
-test -r $file || exit 0
-test -r /etc/leap/ || exit 0
-
-
-case "$1" in
- start)
- echo -n "Starting leap_mx: twistd"
- HOME="/var/lib/leap_mx/" \
- start-stop-daemon --start --quiet --exec /usr/local/bin/twistd -- \
- --pidfile=$pidfile \
- --rundir=$rundir \
- --python=$file \
- --logfile=$logfile
- echo "."
- ;;
-
- stop)
- echo -n "Stopping leap_mx: twistd"
- start-stop-daemon --stop --quiet \
- --pidfile $pidfile
- echo "."
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
-
- force-reload)
- $0 restart
- ;;
-
- *)
- echo "Usage: /etc/init.d/leap_mx {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/pkg/mx.tac b/pkg/leap_mx.tac
index c101de9..c101de9 100755..100644
--- a/pkg/mx.tac
+++ b/pkg/leap_mx.tac
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index ed3ad0d..d20aa25 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -8,6 +8,8 @@ paisley>=0.3.1
# for the time being.
couchdb
-leap.common>=0.3.5
-leap.soledad.common>=0.4.5
-leap.keymanager>=0.3.4
+leap.common>=0.3.7
+leap.soledad.common>=0.5.0
+leap.keymanager>=0.3.8
+
+chardet # we fallback to chardet if cchardet is not available, but it's preferred
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub
deleted file mode 100644
index 1c8fd34..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub
+++ /dev/null
Binary files differ
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec
deleted file mode 100644
index 97a60e7..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec
+++ /dev/null
Binary files differ
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub
deleted file mode 100644
index 1cbf8d8..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub
+++ /dev/null
Binary files differ
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec
deleted file mode 100644
index f89cd97..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec
+++ /dev/null
Binary files differ
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub
deleted file mode 100644
index bc0ac12..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub
+++ /dev/null
Binary files differ
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec
deleted file mode 100644
index 397f44a..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec
+++ /dev/null
Binary files differ
diff --git a/pkg/utils/gpg-keys/gpg-batch-key-script b/pkg/utils/gpg-keys/gpg-batch-key-script
deleted file mode 100644
index 7e48db0..0000000
--- a/pkg/utils/gpg-keys/gpg-batch-key-script
+++ /dev/null
@@ -1,45 +0,0 @@
-%echo Generating keypair 001/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 001/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-001.pub
-%secring generated-2013-02-15_19-15-001.sec
-%commit
-%echo done. 001 keys out of 003 completed.
-
-%echo Generating keypair 002/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 002/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-002.pub
-%secring generated-2013-02-15_19-15-002.sec
-%commit
-%echo done. 002 keys out of 003 completed.
-
-%echo Generating keypair 003/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 003/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-003.pub
-%secring generated-2013-02-15_19-15-003.sec
-%commit
-%echo done. 003 keys out of 003 completed.
-