diff --git a/.travis.yml b/.travis.yml index 311ed4c1..8f41f070 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - INTEGRATION=openldap install: - - if [ "$INTEGRATION" = "openldap" ]; then ./script/install-openldap; fi + - if [ "$INTEGRATION" = "openldap" ]; then sudo script/install-openldap; fi - bundle install script: bundle exec rake ci diff --git a/script/install-openldap b/script/install-openldap index e9575500..b9efac98 100755 --- a/script/install-openldap +++ b/script/install-openldap @@ -6,69 +6,69 @@ BASE_PATH="$( cd `dirname $0`/../test/fixtures/openldap && pwd )" SEED_PATH="$( cd `dirname $0`/../test/fixtures && pwd )" dpkg -s slapd time ldap-utils gnutls-bin ssl-cert > /dev/null ||\ - DEBIAN_FRONTEND=noninteractive sudo -E apt-get update -y --force-yes && \ - DEBIAN_FRONTEND=noninteractive sudo -E apt-get install -y --force-yes slapd time ldap-utils gnutls-bin ssl-cert + DEBIAN_FRONTEND=noninteractive apt-get update -y --force-yes && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes slapd time ldap-utils gnutls-bin ssl-cert -sudo /etc/init.d/slapd stop +/etc/init.d/slapd stop TMPDIR=$(mktemp -d) cd $TMPDIR # Delete data and reconfigure. -sudo cp -v /var/lib/ldap/DB_CONFIG ./DB_CONFIG -sudo rm -rf /etc/ldap/slapd.d/* -sudo rm -rf /var/lib/ldap/* -sudo cp -v ./DB_CONFIG /var/lib/ldap/DB_CONFIG -sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/slapd.conf.ldif +cp -v /var/lib/ldap/DB_CONFIG ./DB_CONFIG +rm -rf /etc/ldap/slapd.d/* +rm -rf /var/lib/ldap/* +cp -v ./DB_CONFIG /var/lib/ldap/DB_CONFIG +slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/slapd.conf.ldif # Load memberof and ref-int overlays and configure them. -sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/memberof.ldif +slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/memberof.ldif # Load retcode overlay and configure -sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/retcode.ldif +slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/retcode.ldif # Add base domain. -sudo slapadd -F /etc/ldap/slapd.d < /etc/ssl/private/cakey.pem" +sh -c "certtool --generate-privkey > /etc/ssl/private/cakey.pem" -sudo sh -c "cat > /etc/ssl/ca.info < /etc/ssl/ca.info < /etc/ssl/ldap01.info < /etc/ssl/ldap01.info <