Merge branch 'master' into 'beta'

Merge changes into beta

See merge request !110

.gitlab-ci.yml

@@ -38,7 +38,7 @@ deploy-beta:
   script:
    - apt update
    - apt install -y curl
-   - curl --insecure https://beta.sucs.org/pull.php
+   - curl https://beta.sucs.org/pull.php
   only:
    - beta
   environment: beta
@@ -48,7 +48,7 @@ deploy-live:
   script:
    - apt update
    - apt install -y curl
-   - curl --insecure https://sucs.org/pull.php
+   - curl https://sucs.org/pull.php
   only:
    - sucs-site
   environment: live
\ No newline at end of file

htdocs/pull.php

 <?php
 
-exec("cd ..; git reset --hard HEAD; git pull");
+exec("cd ..; git reset --hard HEAD; git pull", $retArr, $retVal);
+
+if ($retVal == 0) {
+	print(ok);
+	exit(0)
+}
+
+print("not ok\n");
+var_dump($retArr);
+var_dump($retVal);
 
 ?>
\ No newline at end of file