Merge pull request #15 from downtownallday/github-actions

GitHub actions

.github/workflows/commit-tests.yml

@@ -0,0 +1,38 @@
+name: commit-tests
+on: [push]
+jobs:
+  # MiaB-LDAP connected to a remote Nextcloud
+  remote-nextcloud-docker:
+    runs-on: ubuntu-18.04
+    env:
+      PRIMARY_HOSTNAME: box1.abc.com
+      FEATURE_MUNIN: false
+      # github specific: php-xsl is a virtual package provided by php-xml
+      PHP_XSL_PACKAGE: php-xml
+    steps:
+      - uses: actions/checkout@v2
+      # the github image comes preinstalled with multiple php versions
+      # and it sets the system php to the latest version. MIAB requires
+      # php 7.2 (the default on a new ubuntu 18 install)
+      - run: sudo update-alternatives --set php /usr/bin/php7.2
+      - name: setup
+        run: sudo -E tests/system-setup/remote-nextcloud-docker.sh upgrade basic
+      - name: test-runner
+        run: sudo -E tests/runner.sh -dumpoutput -no-smtp-remote default remote-nextcloud upgrade-basic
+
+
+  # Upgrade from upstream install
+  upgrade-from-upstream:
+    runs-on: ubuntu-18.04
+    env:
+      PRIMARY_HOSTNAME: box2.abc.com
+      UPSTREAM_TAG: main
+      PHP_XSL_PACKAGE: php-xml
+    steps:
+      - uses: actions/checkout@v2
+      - run: sudo update-alternatives --set php /usr/bin/php7.2
+      - name: setup
+        run: sudo -E tests/system-setup/upgrade-from-upstream.sh basic totpuser
+      - name: test-runner
+        run: sudo -E tests/runner.sh -dumpoutput -no-smtp-remote upgrade-basic upgrade-totpuser default
+

README.md

@@ -1,3 +1,5 @@
+[![build](https://github.com/downtownallday/mailinabox-ldap/actions/workflows/commit-tests.yml/badge.svg)](https://github.com/downtownallday/mailinabox-ldap/actions)
+
 # Mail-in-a-Box LDAP
 This is a version of [Mail-in-a-Box](https://mailinabox.email) with LDAP used as the user account database instead of sqlite.
 

setup/zpush.sh

@@ -17,7 +17,7 @@ source /etc/mailinabox.conf # load global vars
 
 echo "Installing Z-Push (Exchange/ActiveSync server)..."
 apt_install \
-	php-soap php-imap libawl-php php-xsl
+	php-soap php-imap libawl-php ${PHP_XSL_PACKAGE:-php-xsl}
 
 phpenmod -v php imap
 

tests/lib/installed-state.sh

@@ -78,7 +78,7 @@ installed_state_compare() {
     local compare_type="all"
     
     source "$s2/info.txt"
-    if grep "mailinabox-ldap.git" <<<"$GIT_ORIGIN" >/dev/null; then
+    if grep "mailinabox-ldap" <<<"$GIT_ORIGIN" >/dev/null; then
         GIT_ORIGIN=""
         source "$s1/info.txt"
         if ! grep "mailinabox-ldap.git" <<<"$GIT_ORIGIN" >/dev/null; then

tests/lib/system.sh

@@ -61,7 +61,17 @@ set_system_hostname() {
     # PRIMARY_HOSTNAME if no FQDN was given
     local fqdn="${1:-$PRIMARY_HOSTNAME}"
     local host="$(awk -F. '{print $1}' <<< "$fqdn")"
-    sed -i 's/^127\.0\.1\.1[ \t].*/127.0.1.1 '"$fqdn $host ip4-loopback/" /etc/hosts || return 1
+    if ! grep '^127.0.1.1' /etc/hosts >/dev/null; then
+        # add it
+        echo "127.0.1.1 $fqdn $host" >> /etc/hosts || return 1
+    else
+        # set it
+        sed -i 's/^127\.0\.1\.1[ \t].*/127.0.1.1 '"$fqdn $host ip4-loopback/" /etc/hosts || return 1
+    fi
+    # ensure name is resolvable
+    if ! /usr/bin/getent hosts "$fqdn" >/dev/null; then
+        return 2
+    fi
     #hostname "$host" || return 1
     #echo "$host" > /etc/hostname
     return 0

tests/system-setup/setup-funcs.sh

@@ -69,7 +69,10 @@ dump_conf_files() {
 #
 init_test_system() {
     H2 "Update /etc/hosts"
-    set_system_hostname || die "Could not set hostname"
+    if ! set_system_hostname; then
+        dump_file "/etc/hosts"
+        die "Could not set hostname"
+    fi
 
     # update system time
     H2 "Set system time"

tests/system-setup/upgrade-from-upstream.sh

@@ -78,6 +78,16 @@ upstream_install() {
         sed -i 's|\(.*include:.*zones\.conf.*\)|cat >> /etc/nsd/nsd.conf <<EOF\n  do-ip4: yes\n  do-ip6: no\nremote-control:\n  control-enable: no\nEOF\n\n\1|' setup/dns.sh \
             || die "Couldn't patch setup/dns.sh !!"
     fi
+
+    if [ ! -z "$PHP_XSL_PACKAGE" ]; then
+        # For Github Actions - github's ubuntu 18 includes multiple
+        # PHP versions pre-installed and the php-xsl package for these
+        # versions is a virtual package of package php-xml. To handle
+        # this, change the setup scripts so that $PHP_XSL_PACKAGE
+        # (php-xml) is installed instead of php-xsl.
+        H2 "Patching upstream setup/zpush.sh to install $PHP_XSL_PACKAGE instead of php-xsl"
+        sed -i "s/php-xsl/$PHP_XSL_PACKAGE/g" setup/zpush.sh
+    fi
     
     H2 "Run upstream setup"
     if ! setup/start.sh; then
@@ -155,6 +165,8 @@ installed_state_capture "/tmp/state/miab-ldap"
 
 # compare states
 if ! installed_state_compare "/tmp/state/upstream" "/tmp/state/miab-ldap"; then
+    dump_file "/tmp/state/upstream/info.txt"
+    dump_file "/tmp/state/miab-ldap/info.txt"
     die "Upstream and upgraded states are different !"
 fi