From 19ce41fc02f438ab1fcb6fc396b67418fc405c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Tue, 20 Apr 2021 16:18:38 +0200
Subject: [PATCH] fix: [GHA] change in hostname, bump pymisp, fix vhost

---
 .github/workflows/main.yml    | 5 ++++-
 PyMISP                        | 2 +-
 build/github-action-ci-apache | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b3c5f51d1..66a28e0e3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Initialize variables
         run: |
           echo "USER=`id -u -n`" >> $GITHUB_ENV
-          echo "HOST=`hostname`" >> $GITHUB_ENV
+          echo "HOST=localhost" >> $GITHUB_ENV
 
       # Runs a set of commands using the runners shell
       - name: Install deps
@@ -203,6 +203,8 @@ jobs:
 
       - name: Test if apache is working
         run: |
+              sudo systemctl status apache2 --no-pager -l
+              sudo apache2ctl -S
               curl http://${HOST}
               sudo chmod -R 777 PyMISP
               pushd PyMISP
@@ -247,3 +249,4 @@ jobs:
         if: ${{ always() }}
         run: |
               tail -n +1 `pwd`/app/tmp/logs/*
+              tail -n +1 /var/log/apache2/*.log
diff --git a/PyMISP b/PyMISP
index 67457bec5..b471633ac 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 67457bec5380139af3aa8dc93c021457659c5697
+Subproject commit b471633acb12cdfd357ae1f2de91b415fd9b64f6
diff --git a/build/github-action-ci-apache b/build/github-action-ci-apache
index 33d32793e..ceeb6e314 100644
--- a/build/github-action-ci-apache
+++ b/build/github-action-ci-apache
@@ -1,4 +1,4 @@
-<VirtualHost %HOST%>
+<VirtualHost *:80>
         ServerAdmin me@me.local
         ServerName %HOST%
         DocumentRoot %GITHUB_WORKSPACE%/app/webroot