From 6f9a1a2db5f23ebe392177dcf6ce8f391b980d19 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Fri, 9 Mar 2018 12:21:21 +0200
Subject: [PATCH] Remove php and openssh-server due to /etc/alternatives
 conflicts

both packages pull in nss which fails to export because it
contains a symlink (via /etc/alternatives) to p11-kit-trust:

/usr/lib64/libnssckbi.so -> /etc/alternatives/libnssckbi.so.x86_64
/etc/alternatives/libnssckbi.so.x86_64 -> /usr/lib64/pkcs11/p11-kit-trust.so

When `bdcs-cli compose tar` is executed it errors out on the above
link because one of the two files will always be exported first!

Ultimately the fix needs to go upstream but this is still very new,
so we take the easiest path to let the tests continue working, see:
https://github.com/fedora-sysv/chkconfig/issues/9
---
 examples/recipes/http-server.toml |  8 --------
 tests/images/http-server.03.test  | 15 ---------------
 2 files changed, 23 deletions(-)
 delete mode 100644 tests/images/http-server.03.test

diff --git a/examples/recipes/http-server.toml b/examples/recipes/http-server.toml
index 7bcd92a..5fe8a9f 100644
--- a/examples/recipes/http-server.toml
+++ b/examples/recipes/http-server.toml
@@ -13,18 +13,10 @@ version = "5.4"
 name = "mod_ssl"
 version = "2.4.*"
 
-[[modules]]
-name = "php"
-version = "7.1.*"
-
 [[packages]]
 name = "tmux"
 version = "2.5"
 
-[[packages]]
-name = "openssh-server"
-version = "7.5*"
-
 [[packages]]
 name = "rsync"
 version = "3.1.*"
diff --git a/tests/images/http-server.03.test b/tests/images/http-server.03.test
deleted file mode 100644
index 65cb796..0000000
--- a/tests/images/http-server.03.test
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-
-# PROCEED to test if PHP works
-
-echo "<?php phpinfo(); ?>" | php >/dev/null
-
-if [ $? -ne 0 ]; then
-    echo "ERROR: didn't find index.html for localhost"
-    exit 1
-else
-    echo "INFO: PHP works"
-fi