From 35b329a1d2ebf8fff09830603c2ec9b62aa0132e Mon Sep 17 00:00:00 2001 From: Graham Williamson Date: Tue, 6 Aug 2019 17:31:12 +1000 Subject: [PATCH 1/7] Adds 389-ds setup to travis --- .travis.yml | 1 + scripts/setup-389-ds.sh | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100755 scripts/setup-389-ds.sh diff --git a/.travis.yml b/.travis.yml index bc8aade..00d8189 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: - 3.4 - 3.5 - 3.6 +before_install: ./scripts/setup-389-ds.sh install: - pip install tox-travis script: diff --git a/scripts/setup-389-ds.sh b/scripts/setup-389-ds.sh new file mode 100755 index 0000000..62a7fee --- /dev/null +++ b/scripts/setup-389-ds.sh @@ -0,0 +1,37 @@ +#!/bin/sh +set -eo + +apt-get install 389-ds-base + +cat < /root/instance.inf +# /root/instance.inf +[general] +config_version = 2 + +[slapd] +root_password = YOUR_ADMIN_PASSWORD_HERE + +[backend-userroot] +sample_entries = yes +suffix = dc=example,dc=com +EOF + +dscreate from-file /root/instance.inf + +dsctl localhost status + +cat << EOF > /root/.dsrc +[localhost] +# Note that '/' is replaced to '%%2f'. +uri = ldapi://%%2fvar%%2frun%%2fslapd-localhost.socket +basedn = dc=example,dc=com +binddn = cn=Directory Manager +EOF + +whoami + +dsidm localhost user create --uid eve --cn Eve --displayName 'Eve User - Devpi test' --uidNumber 1001 --gidNumber 1001 --homeDirectory /home/eve +dsidm localhost user create --uid alice --cn Alice --displayName 'Alice User - Devpi test' --uidNumber 1002 --gidNumber 1002 --homeDirectory /home/alice + +dsidm localhost group create --cn devpi_admins +dsidm localhost group add_member devpi_admins uid=alice,ou=people,dc=example,dc=com From 8bcb0ff3ce191acb75219353f51875babed1d442 Mon Sep 17 00:00:00 2001 From: Graham Williamson Date: Tue, 6 Aug 2019 17:39:18 +1000 Subject: [PATCH 2/7] Enable debugging for visibility in travis-ci --- scripts/setup-389-ds.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup-389-ds.sh b/scripts/setup-389-ds.sh index 62a7fee..6954595 100755 --- a/scripts/setup-389-ds.sh +++ b/scripts/setup-389-ds.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -eo +set -eox apt-get install 389-ds-base From f1d49a76996edbfefeaa33afe97cf649a9df2959 Mon Sep 17 00:00:00 2001 From: Graham Williamson Date: Tue, 6 Aug 2019 17:43:23 +1000 Subject: [PATCH 3/7] Fixes permission for command --- scripts/setup-389-ds.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/setup-389-ds.sh b/scripts/setup-389-ds.sh index 6954595..505fdbe 100755 --- a/scripts/setup-389-ds.sh +++ b/scripts/setup-389-ds.sh @@ -1,7 +1,9 @@ #!/bin/sh set -eox -apt-get install 389-ds-base +whoami + +sudo apt-get install 389-ds-base cat < /root/instance.inf # /root/instance.inf @@ -28,8 +30,6 @@ basedn = dc=example,dc=com binddn = cn=Directory Manager EOF -whoami - dsidm localhost user create --uid eve --cn Eve --displayName 'Eve User - Devpi test' --uidNumber 1001 --gidNumber 1001 --homeDirectory /home/eve dsidm localhost user create --uid alice --cn Alice --displayName 'Alice User - Devpi test' --uidNumber 1002 --gidNumber 1002 --homeDirectory /home/alice From ae8c4bd112fd9ad4646fca5579829298bffad802 Mon Sep 17 00:00:00 2001 From: Graham Williamson Date: Tue, 6 Aug 2019 19:14:07 +1000 Subject: [PATCH 4/7] This should add universe sources to travis instance --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00d8189..b3ed91f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ python: - 3.4 - 3.5 - 3.6 -before_install: ./scripts/setup-389-ds.sh +before_install: + - sudo add-apt-repository universe + - ./scripts/setup-389-ds.sh install: - pip install tox-travis script: From b0ebaa00aea60ae077c4067bf0b5678976a01460 Mon Sep 17 00:00:00 2001 From: Graham Williamson Date: Tue, 6 Aug 2019 19:27:15 +1000 Subject: [PATCH 5/7] Update added source repo --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b3ed91f..9c99fc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ python: - 3.6 before_install: - sudo add-apt-repository universe + - sudo apt-get update - ./scripts/setup-389-ds.sh install: - pip install tox-travis From 52796ad0473d9e421838b907df7cea9e2c7e2b75 Mon Sep 17 00:00:00 2001 From: Graham Williamson Date: Tue, 6 Aug 2019 19:48:50 +1000 Subject: [PATCH 6/7] Fixes permission issue writing file for root user --- scripts/setup-389-ds.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/setup-389-ds.sh b/scripts/setup-389-ds.sh index 505fdbe..80015f5 100755 --- a/scripts/setup-389-ds.sh +++ b/scripts/setup-389-ds.sh @@ -5,7 +5,8 @@ whoami sudo apt-get install 389-ds-base -cat < /root/instance.inf + +cat << EOF | sudo tee /root/instance.inf # /root/instance.inf [general] config_version = 2 @@ -18,11 +19,11 @@ sample_entries = yes suffix = dc=example,dc=com EOF -dscreate from-file /root/instance.inf +sudo dscreate from-file /root/instance.inf dsctl localhost status -cat << EOF > /root/.dsrc +cat << EOF | sudo tee /root/.dsrc [localhost] # Note that '/' is replaced to '%%2f'. uri = ldapi://%%2fvar%%2frun%%2fslapd-localhost.socket @@ -30,8 +31,8 @@ basedn = dc=example,dc=com binddn = cn=Directory Manager EOF -dsidm localhost user create --uid eve --cn Eve --displayName 'Eve User - Devpi test' --uidNumber 1001 --gidNumber 1001 --homeDirectory /home/eve -dsidm localhost user create --uid alice --cn Alice --displayName 'Alice User - Devpi test' --uidNumber 1002 --gidNumber 1002 --homeDirectory /home/alice +sudo dsidm localhost user create --uid eve --cn Eve --displayName 'Eve User - Devpi test' --uidNumber 1001 --gidNumber 1001 --homeDirectory /home/eve +sudo dsidm localhost user create --uid alice --cn Alice --displayName 'Alice User - Devpi test' --uidNumber 1002 --gidNumber 1002 --homeDirectory /home/alice -dsidm localhost group create --cn devpi_admins -dsidm localhost group add_member devpi_admins uid=alice,ou=people,dc=example,dc=com +sudo dsidm localhost group create --cn devpi_admins +sudo dsidm localhost group add_member devpi_admins uid=alice,ou=people,dc=example,dc=com From 92b49d0f120200c5873ec6ae32926d1d471a4346 Mon Sep 17 00:00:00 2001 From: Graham Williamson Date: Tue, 6 Aug 2019 20:10:49 +1000 Subject: [PATCH 7/7] Adds lib389 client tools for easier ldap server configuation --- .travis.yml | 1 + scripts/setup-389-ds.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c99fc2..5c8e124 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +dist: bionic sudo: false python: - 2.7 diff --git a/scripts/setup-389-ds.sh b/scripts/setup-389-ds.sh index 80015f5..c1e7c2d 100755 --- a/scripts/setup-389-ds.sh +++ b/scripts/setup-389-ds.sh @@ -3,7 +3,7 @@ set -eox whoami -sudo apt-get install 389-ds-base +sudo apt-get install 389-ds-base python3-lib389 cat << EOF | sudo tee /root/instance.inf