From 0a048ce05833990eadcafed163939e847c421352 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 26 Jun 2017 12:48:01 +0200
Subject: [pkg] rename soledad-create-userdb script in all the places

---
 pkg/server/soledad-create-userdb          | 4 ++--
 pkg/server/soledad-sudoers                | 2 +-
 scripts/deploy/deploy_soledad_from_git    | 2 +-
 testing/test_soledad/fixture_soledad.conf | 2 +-
 testing/tests/server/test_config.py       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/server/soledad-create-userdb b/pkg/server/soledad-create-userdb
index 5e0ef5e2..24dfbb10 100755
--- a/pkg/server/soledad-create-userdb
+++ b/pkg/server/soledad-create-userdb
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# create-user-db
-# Copyright (C) 2015 LEAP
+# soledad-create-userdb
+# Copyright (C) 2015-2017 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
diff --git a/pkg/server/soledad-sudoers b/pkg/server/soledad-sudoers
index 642497f8..e0d87368 100644
--- a/pkg/server/soledad-sudoers
+++ b/pkg/server/soledad-sudoers
@@ -1,2 +1,2 @@
-Cmnd_Alias SOLEDAD_CREATE_DB = /usr/bin/create-user-db
+Cmnd_Alias SOLEDAD_CREATE_DB = /usr/bin/soledad-create-userdb
 soledad ALL=(soledad-admin) NOPASSWD: SOLEDAD_CREATE_DB
diff --git a/scripts/deploy/deploy_soledad_from_git b/scripts/deploy/deploy_soledad_from_git
index 3c4ac8be..e95aae83 100755
--- a/scripts/deploy/deploy_soledad_from_git
+++ b/scripts/deploy/deploy_soledad_from_git
@@ -39,7 +39,7 @@ rm -rf $SOLEDADPATH
 # copy over some stuff that we'll need -- stolen from debian package
 cp -r $LOCALREPO/server/src/leap/soledad/server $SOLEDADPATH
 cp $LOCALREPO/server/pkg/soledad-server.service $SYSTEMDINIT
-cp $LOCALREPO/server/pkg/create-user-db /usr/bin/
+cp $LOCALREPO/server/pkg/soledad-create-userdb /usr/bin/
 cp $LOCALREPO/server/pkg/soledad-sudoers /etc/sudoers.d/
 
 # Let's append the branch info to the version string! So that nobody is lost
diff --git a/testing/test_soledad/fixture_soledad.conf b/testing/test_soledad/fixture_soledad.conf
index 8d8161c3..16fd0f4f 100644
--- a/testing/test_soledad/fixture_soledad.conf
+++ b/testing/test_soledad/fixture_soledad.conf
@@ -1,6 +1,6 @@
 [soledad-server]
 couch_url   = http://soledad:passwd@localhost:5984
-create_cmd  = sudo -u soledad-admin /usr/bin/create-user-db
+create_cmd  = sudo -u soledad-admin /usr/bin/soledad-create-userdb
 admin_netrc = /etc/couchdb/couchdb-soledad-admin.netrc
 batching    = 0
 
diff --git a/testing/tests/server/test_config.py b/testing/tests/server/test_config.py
index d2a8a9de..fc138f0f 100644
--- a/testing/tests/server/test_config.py
+++ b/testing/tests/server/test_config.py
@@ -60,7 +60,7 @@ class ConfigurationParsingTest(unittest.TestCase):
         expected = {'couch_url':
                     'http://soledad:passwd@localhost:5984',
                     'create_cmd':
-                    'sudo -u soledad-admin /usr/bin/create-user-db',
+                    'sudo -u soledad-admin /usr/bin/soledad-create-userdb',
                     'admin_netrc':
                     '/etc/couchdb/couchdb-soledad-admin.netrc',
                     'batching': False,
-- 
cgit v1.2.3