From 260805b9967184841c4499f94713a9a48c49a813 Mon Sep 17 00:00:00 2001 From: drebs Date: Sun, 18 Dec 2016 16:36:39 -0200 Subject: [feat] use twisted web http auth and creds --- server/pkg/soledad-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/pkg') diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server index 753a260b..92560fa8 100644 --- a/server/pkg/soledad-server +++ b/server/pkg/soledad-server @@ -11,7 +11,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin PIDFILE=/var/run/soledad.pid -RESOURCE_CLASS=leap.soledad.server.resource.SoledadResource +RESOURCE_CLASS=leap.soledad.server.session.SoledadSession HTTPS_PORT=2424 CONFDIR=/etc/soledad CERT_PATH="${CONFDIR}/soledad-server.pem" -- cgit v1.2.3 From 47858d88ca4ca10ac363c71550b1bafe50f8f4ce Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 26 Jan 2017 19:18:15 -0200 Subject: [refactor] allow passing threadpool pool for server sync resource Conflicts: server/src/leap/soledad/server/_resource.py testing/tests/server/test__resource.py --- server/pkg/soledad-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/pkg') diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server index 92560fa8..450f2277 100644 --- a/server/pkg/soledad-server +++ b/server/pkg/soledad-server @@ -11,7 +11,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin PIDFILE=/var/run/soledad.pid -RESOURCE_CLASS=leap.soledad.server.session.SoledadSession +RESOURCE_CLASS=leap.soledad.server.entrypoint.SoledadEntrypoint HTTPS_PORT=2424 CONFDIR=/etc/soledad CERT_PATH="${CONFDIR}/soledad-server.pem" -- cgit v1.2.3 From b6359ed68d611cfa11b11e0591eb6186351793bd Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 9 Feb 2017 18:01:40 +0100 Subject: [pkg] add systemd service file to master this is to ease the packaging flow used in some environments like Pixelated, that use a debian branch against different branches. - Resolves: #8762 --- server/pkg/soledad-server.service | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 server/pkg/soledad-server.service (limited to 'server/pkg') diff --git a/server/pkg/soledad-server.service b/server/pkg/soledad-server.service new file mode 100644 index 00000000..ccd03b97 --- /dev/null +++ b/server/pkg/soledad-server.service @@ -0,0 +1,31 @@ +[Unit] +Description=Soledad Server + +[Service] +Environment=PATH=/sbin:/bin:/usr/sbin:/usr/bin +Environment=CLASS=leap.soledad.server.resource.SoledadResource +Environment=HTTPS_PORT=2424 +Environment=CERT_PATH=/etc/soledad/soledad-server.pem +Environment=PRIVKEY_PATH=/etc/soledad/soledad-server.key +Environment=HOME=/var/lib/soledad/ +Environment=SSL_METHOD=SSLv23_METHOD +EnvironmentFile=-/etc/default/soledad + +ExecStart=/usr/bin/twistd \ + --nodaemon \ + --pidfile= \ + --syslog \ + --prefix=soledad-server \ + web \ + --class=${CLASS} \ + --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD} + +WorkingDirectory=/var/lib/soledad/ + +User=soledad +Group=soledad + +Restart=always + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3 From cfc0dadc7cc927dd9ee6df8c07c1094ccfdc53c5 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 10 Feb 2017 00:15:25 +0100 Subject: [bug] fix typo in the resource path --- server/pkg/soledad-server.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/pkg') diff --git a/server/pkg/soledad-server.service b/server/pkg/soledad-server.service index ccd03b97..85a156b5 100644 --- a/server/pkg/soledad-server.service +++ b/server/pkg/soledad-server.service @@ -3,7 +3,7 @@ Description=Soledad Server [Service] Environment=PATH=/sbin:/bin:/usr/sbin:/usr/bin -Environment=CLASS=leap.soledad.server.resource.SoledadResource +Environment=CLASS=leap.soledad.server._resource.SoledadResource Environment=HTTPS_PORT=2424 Environment=CERT_PATH=/etc/soledad/soledad-server.pem Environment=PRIVKEY_PATH=/etc/soledad/soledad-server.key -- cgit v1.2.3 From 3b41a4de9c0d0f32815fbd11df3b379bc8688069 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 10 Feb 2017 22:45:40 +0100 Subject: [pkg] use the entrypoint from the systemd script too --- server/pkg/soledad-server.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/pkg') diff --git a/server/pkg/soledad-server.service b/server/pkg/soledad-server.service index 85a156b5..30c4bf88 100644 --- a/server/pkg/soledad-server.service +++ b/server/pkg/soledad-server.service @@ -3,7 +3,7 @@ Description=Soledad Server [Service] Environment=PATH=/sbin:/bin:/usr/sbin:/usr/bin -Environment=CLASS=leap.soledad.server._resource.SoledadResource +Environment=CLASS=leap.soledad.server.entrypoint.SoledadEntrypoint Environment=HTTPS_PORT=2424 Environment=CERT_PATH=/etc/soledad/soledad-server.pem Environment=PRIVKEY_PATH=/etc/soledad/soledad-server.key -- cgit v1.2.3 From 6cabe46e4671627c22d5eed9ebb3bdc751948414 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Sun, 12 Feb 2017 20:33:48 +0100 Subject: [refactor] update create-user-db script to use config refactor --- server/pkg/create-user-db | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'server/pkg') diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index 9e2b6b50..fe1a99a0 100755 --- a/server/pkg/create-user-db +++ b/server/pkg/create-user-db @@ -38,8 +38,9 @@ parser.add_argument('dbname', metavar='user-d34db33f', type=str, help='database name on the format user-{uuid4}') parser.add_argument('--migrate-all', action='store_true', help="recreate all design docs for all existing account") -CONF = load_configuration('/etc/soledad/soledad-server.conf') -NETRC_PATH = CONF['soledad-server']['admin_netrc'] +CONF = get_config() +DBCONF = get_config(section='database-security') +NETRC_PATH = CONF['admin_netrc'] def url_for_db(dbname): @@ -78,7 +79,7 @@ def ensure_database(dbname): print ("Invalid name! %s" % dbname) sys.exit(1) url = url_for_db(dbname) - db_security = CONF['database-security'] + db_security = DBCONF db = CouchDatabase.open_database(url=url, create=True, replica_uid=None, database_security=db_security) -- cgit v1.2.3 From 12e14b761d4669a2f654d870d444356623ffc56f Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 13 Feb 2017 14:19:49 +0100 Subject: [bug] fix import typo on create-user-db --- server/pkg/create-user-db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/pkg') diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index fe1a99a0..5cc1754b 100755 --- a/server/pkg/create-user-db +++ b/server/pkg/create-user-db @@ -22,7 +22,7 @@ import argparse from leap.soledad.common.couch import CouchDatabase from leap.soledad.common.couch.state import is_db_name_valid from leap.soledad.common.couch import list_users_dbs -from leap.soledad.server.config import load_configuration +from leap.soledad.server.config import get_config BYPASS_AUTH = os.environ.get('SOLEDAD_BYPASS_AUTH', False) -- cgit v1.2.3 From 19dfe7e9d1f1862026e768301da2ee1273ec7f9f Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 13 Feb 2017 14:28:07 +0100 Subject: [bug] fix typo, again --- server/pkg/create-user-db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/pkg') diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db index 5cc1754b..5e0ef5e2 100755 --- a/server/pkg/create-user-db +++ b/server/pkg/create-user-db @@ -22,7 +22,7 @@ import argparse from leap.soledad.common.couch import CouchDatabase from leap.soledad.common.couch.state import is_db_name_valid from leap.soledad.common.couch import list_users_dbs -from leap.soledad.server.config import get_config +from leap.soledad.server._config import get_config BYPASS_AUTH = os.environ.get('SOLEDAD_BYPASS_AUTH', False) -- cgit v1.2.3 From e600a7f57c177fa45c598d24248ef937f1d02e4b Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 13 Feb 2017 14:13:14 +0100 Subject: [pkg] add script for deploying from git - Resolves: #8765 --- server/pkg/soledad-sudoers | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 server/pkg/soledad-sudoers (limited to 'server/pkg') diff --git a/server/pkg/soledad-sudoers b/server/pkg/soledad-sudoers new file mode 100644 index 00000000..642497f8 --- /dev/null +++ b/server/pkg/soledad-sudoers @@ -0,0 +1,2 @@ +Cmnd_Alias SOLEDAD_CREATE_DB = /usr/bin/create-user-db +soledad ALL=(soledad-admin) NOPASSWD: SOLEDAD_CREATE_DB -- cgit v1.2.3