Update docker-compose config location (#141 )

Update actions/stale action to v3 (#139 )
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-10-23 10:37:55 +01:00 · 2020-10-23 10:27:16 +01:00 · 2020-09-28 19:26:51 +01:00 · 2020-09-08 22:16:27 +01:00 · 2020-09-05 16:43:48 +01:00 · 2020-08-31 19:16:33 +01:00
10 changed files with 442 additions and 492 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
      - id: release
        uses: rymndhng/release-on-push-action@master
        with:
-          bump_version_scheme: minor
+          bump_version_scheme: patch
          
      - name: Check Output Parameters
        run: |
@@ -60,7 +60,7 @@ jobs:
    - name: Update image on server
      uses: garygrossgarten/github-action-ssh@release
      with:
-        command: cd /docker/active/fhed && docker-compose pull && docker-compose up -d
+        command: docker-compose -f /docker/active/fhed.yml -p fhed pull && docker-compose -f /docker/active/fhed.yml -p fhed up -d
        host: ${{ secrets.SSH_HOST }}
        port: ${{ secrets.SSH_PORT }}
        username: ${{ secrets.SSH_USERNAME }}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/stale@v1
+    - uses: actions/stale@v3
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        stale-issue-message: 'This issue has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.'
--- a/app/composer.json
+++ b/app/composer.json
@@ -3,6 +3,6 @@
    "ramsey/uuid": "^4.0",
    "vlucas/phpdotenv": "^5.0",
    "jumbojett/openid-connect-php": "^0.9.0",
-        "sentry/sdk": "^2.1"
+    "sentry/sdk": "^3.0"
  }
 }
--- a/app/composer.lock
+++ b/app/composer.lock
--- a/app/includes/footer.php
+++ b/app/includes/footer.php
@@ -1,3 +1,4 @@
+</main>
 <footer class="footer mt-auto py-3">
  <div class="text-center text-muted">
    <?php
--- a/app/includes/header.php
+++ b/app/includes/header.php
@@ -19,6 +19,8 @@
  </head>

  <body class="d-flex flex-column h-100">
+    <!-- Begin page content -->
+    <main role="main" class="flex-shrink-0">
    <header>
    <!-- Fixed navbar -->
    <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
@@ -32,10 +34,14 @@
                <a class="nav-link" href="/">Home</a>
                </li>
                <li class="nav-item">
-                <a class="nav-link <?php if (!is_signed_in()) {echo(' disabled');} ?>" href="/new">New request</a>
+                <a class="nav-link <?php if (!is_signed_in()) {
+    echo(' disabled');
+} ?>" href="/new">New request</a>
                </li>
                <li class="nav-item">
-                <a class="nav-link <?php if (!is_signed_in()) {echo(' disabled');} ?>" href="/existing">Existing requests</a>
+                <a class="nav-link <?php if (!is_signed_in()) {
+    echo(' disabled');
+} ?>" href="/existing">Existing requests</a>
                </li>
            </ul>
        <div class="mt-2 mt-md-0">
--- a/app/includes/prereqs.php
+++ b/app/includes/prereqs.php
@@ -22,7 +22,8 @@ if (file_exists("/../includes/install.php")) {
    add_action('run_db_populate');
 }

-function run_db_populate() {
+function run_db_populate()
+{
    // all my glorious one-time-magic.
    include("/../includes/install.php");
    // after all execution rename your file;
@@ -38,6 +39,7 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

 // OpenID Connect
 use Jumbojett\OpenIDConnectClient;
+
 $oidc = new OpenIDConnectClient($_ENV['OIDC_HOST'], $_ENV['OIDC_CLIENT_ID'], $_ENV['OIDC_CLIENT_SECRET']);
 if ($_ENV['OIDC_DISABLE_SSL'] == "true") {
    $oidc->setVerifyHost(false);
--- a/app/public/index.php
+++ b/app/public/index.php
@@ -10,10 +10,6 @@
 ?>


-
-<!-- Begin page content -->
-<main role="main" class="flex-shrink-0">
-
  <section>
    <?php
      if (isset($alert)) {
@@ -37,7 +33,11 @@
      <h1>Welcome to <?php echo($_ENV['APP_NAME']); ?></h1>
      <p class="lead text-muted">
        <?php
-          if ($_ENV['APP_NAME'] == "FHeD") {echo("The Free HelpDesk");} else {echo($_ENV['APP_NAME']);};
+          if ($_ENV['APP_NAME'] == "FHeD") {
+              echo("The Free HelpDesk");
+          } else {
+              echo($_ENV['APP_NAME']);
+          };
        ?>
        is the one-stop shop for all of your IT-related needs. Let us know how we can help you by opening a request.
      </p>
@@ -80,7 +80,9 @@
                  </div>
                </div>
              </li>
-              <?php } } ?>
+              <?php
+                    }
+                } ?>
            </ul>
          </div>
        </div>
@@ -109,7 +111,8 @@
                  </div>
                </div>
              </li>
-              <?php } } ?>
+              <?php }
+                } ?>
            </ul>
          </div>
        </section>
@@ -118,8 +121,6 @@
    </div>
  <?php } ?>

-</main>
-
 <?php
    require_once __DIR__ . "/../includes/footer.php";
 ?>
Author	SHA1	Message	Date
Luke Tainton	80679499e1	Update docker-compose config location (#141 )	2020-10-23 10:37:55 +01:00
renovate[bot]	23bf431c74	Update actions/stale action to v3 (#139 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2020-10-23 10:27:16 +01:00
renovate[bot]	4bced68a09	Update dependency sentry/sdk to v3 (#138 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2020-09-28 19:26:51 +01:00
Alexander Davis	4d3ace9d67	Update deploy.yml (#137 )	2020-09-08 22:16:27 +01:00
restyled-io[bot]	e9f1b8477a	Restyle Updates (#135 ) * Restyled by jq * Restyled by php-cs-fixer * Restyled by whitespace Co-authored-by: Restyled.io <commits@restyled.io>	2020-09-05 16:43:48 +01:00
Luke Tainton	9809b028d4	🐛 Move opening and closing 'main' tags (#132 ) * 🐛 Move opening and closing 'main' tags Signed-off-by: Luke Tainton <luke@tainton.uk> * Restyled by php-cs-fixer (#133) Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <commits@restyled.io>	2020-08-31 19:16:33 +01:00