diff --git a/files/debs/general b/files/debs/general index edf64ce932..20490c6072 100644 --- a/files/debs/general +++ b/files/debs/general @@ -1,3 +1,5 @@ +apache2 +apache2-dev bc bridge-utils bsdmainutils @@ -9,6 +11,7 @@ gettext # used for compiling message catalogs git graphviz # needed for docs iputils-ping +libapache2-mod-proxy-uwsgi libffi-dev # for pyOpenSSL libjpeg-dev # Pillow 3.0.0 libmysqlclient-dev # MySQL-python diff --git a/files/rpms/general b/files/rpms/general index baba06b5ab..106aa6ae88 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -7,6 +7,8 @@ gcc-c++ gettext # used for compiling message catalogs git-core graphviz # needed only for docs +httpd +httpd-devel iptables-services # NOPRIME f23,f24,f25 java-1.7.0-openjdk-headless # NOPRIME rhel7 java-1.8.0-openjdk-headless # NOPRIME f23,f24,f25 diff --git a/tests/test_functions.sh b/tests/test_functions.sh index 8aae23dcb8..adf20cdb80 100755 --- a/tests/test_functions.sh +++ b/tests/test_functions.sh @@ -224,7 +224,7 @@ fi # test against removed package...was a bug on Ubuntu if is_ubuntu; then - PKG=cowsay + PKG=cowsay-off if ! (dpkg -s $PKG >/dev/null 2>&1); then # it was never installed...set up the condition sudo apt-get install -y cowsay >/dev/null 2>&1