[SUCS Devel] [Git][sucssite/sucs-site][beta] 3 commits: Revert "throw in a --insecure as the LE cert not trusted by this docker container"

[Imran Hussain]

Imran Hussain pushed to branch beta at sucssite / sucs-site


Commits:
503dc539 by Imran Hussain at 2019-07-02T08:34:45Z
Revert "throw in a --insecure as the LE cert not trusted by this docker container"

This reverts commit 8c489c75f2d45e8cff4327b6ae449a9221bfbcca
- - - - -
56268f16 by Imran Hussain at 2019-07-02T08:41:18Z
make the pull script do errors better

- - - - -
6cf55875 by Imran Hussain at 2019-07-02T08:45:16Z
Merge branch 'master' into 'beta'

Merge changes into beta

See merge request sucssite/sucs-site!110
- - - - -


2 changed files:

- .gitlab-ci.yml
- htdocs/pull.php


Changes:

=====================================
.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
=====================================
@@ -1,5 +1,14 @@
 <?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



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/2852e83bde99c94ac4c66d213234d05977e2b027...6cf55875dd6ceb4e3335765898fbed2252a531f8

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/2852e83bde99c94ac4c66d213234d05977e2b027...6cf55875dd6ceb4e3335765898fbed2252a531f8
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190702/4ea31537/attachment-0001.html>