Merge branch 'beta' into 'sucs-site'

ability for site to auto deploy

See merge request !111

.gitlab-ci.yml

@@ -33,18 +33,22 @@ js-syntax-check:
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-fake-deploy-beta:
+deploy-beta:
   stage: deploy
   script:
-   - echo "Hello World!"
+   - apt update
+   - apt install -y curl
+   - curl https://beta.sucs.org/pull.php
   only:
    - beta
   environment: beta
 
-fake-deploy-live:
+deploy-live:
   stage: deploy
   script:
-   - echo "Hello World!"
+   - apt update
+   - apt install -y curl
+   - 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", $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