Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 80679499e1 | |||
|
23bf431c74 | ||
|
|
4bced68a09 | ||
|
4d3ace9d67 | ||
|
e9f1b8477a | ||
| 9809b028d4 |
4
.github/workflows/deploy.yml
vendored
4
.github/workflows/deploy.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
|||||||
- id: release
|
- id: release
|
||||||
uses: rymndhng/release-on-push-action@master
|
uses: rymndhng/release-on-push-action@master
|
||||||
with:
|
with:
|
||||||
bump_version_scheme: minor
|
bump_version_scheme: patch
|
||||||
|
|
||||||
- name: Check Output Parameters
|
- name: Check Output Parameters
|
||||||
run: |
|
run: |
|
||||||
@@ -60,7 +60,7 @@ jobs:
|
|||||||
- name: Update image on server
|
- name: Update image on server
|
||||||
uses: garygrossgarten/github-action-ssh@release
|
uses: garygrossgarten/github-action-ssh@release
|
||||||
with:
|
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 }}
|
host: ${{ secrets.SSH_HOST }}
|
||||||
port: ${{ secrets.SSH_PORT }}
|
port: ${{ secrets.SSH_PORT }}
|
||||||
username: ${{ secrets.SSH_USERNAME }}
|
username: ${{ secrets.SSH_USERNAME }}
|
||||||
|
|||||||
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@v1
|
- uses: actions/stale@v3
|
||||||
with:
|
with:
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
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.'
|
stale-issue-message: 'This issue has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.'
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
"ramsey/uuid": "^4.0",
|
"ramsey/uuid": "^4.0",
|
||||||
"vlucas/phpdotenv": "^5.0",
|
"vlucas/phpdotenv": "^5.0",
|
||||||
"jumbojett/openid-connect-php": "^0.9.0",
|
"jumbojett/openid-connect-php": "^0.9.0",
|
||||||
"sentry/sdk": "^2.1"
|
"sentry/sdk": "^3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
816
app/composer.lock
generated
816
app/composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,4 @@
|
|||||||
|
</main>
|
||||||
<footer class="footer mt-auto py-3">
|
<footer class="footer mt-auto py-3">
|
||||||
<div class="text-center text-muted">
|
<div class="text-center text-muted">
|
||||||
<?php
|
<?php
|
||||||
|
|||||||
@@ -19,6 +19,8 @@
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body class="d-flex flex-column h-100">
|
<body class="d-flex flex-column h-100">
|
||||||
|
<!-- Begin page content -->
|
||||||
|
<main role="main" class="flex-shrink-0">
|
||||||
<header>
|
<header>
|
||||||
<!-- Fixed navbar -->
|
<!-- Fixed navbar -->
|
||||||
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
|
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
|
||||||
@@ -32,10 +34,14 @@
|
|||||||
<a class="nav-link" href="/">Home</a>
|
<a class="nav-link" href="/">Home</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item">
|
<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>
|
||||||
<li class="nav-item">
|
<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>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="mt-2 mt-md-0">
|
<div class="mt-2 mt-md-0">
|
||||||
|
|||||||
@@ -22,7 +22,8 @@ if (file_exists("/../includes/install.php")) {
|
|||||||
add_action('run_db_populate');
|
add_action('run_db_populate');
|
||||||
}
|
}
|
||||||
|
|
||||||
function run_db_populate() {
|
function run_db_populate()
|
||||||
|
{
|
||||||
// all my glorious one-time-magic.
|
// all my glorious one-time-magic.
|
||||||
include("/../includes/install.php");
|
include("/../includes/install.php");
|
||||||
// after all execution rename your file;
|
// after all execution rename your file;
|
||||||
@@ -38,6 +39,7 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
|||||||
|
|
||||||
// OpenID Connect
|
// OpenID Connect
|
||||||
use Jumbojett\OpenIDConnectClient;
|
use Jumbojett\OpenIDConnectClient;
|
||||||
|
|
||||||
$oidc = new OpenIDConnectClient($_ENV['OIDC_HOST'], $_ENV['OIDC_CLIENT_ID'], $_ENV['OIDC_CLIENT_SECRET']);
|
$oidc = new OpenIDConnectClient($_ENV['OIDC_HOST'], $_ENV['OIDC_CLIENT_ID'], $_ENV['OIDC_CLIENT_SECRET']);
|
||||||
if ($_ENV['OIDC_DISABLE_SSL'] == "true") {
|
if ($_ENV['OIDC_DISABLE_SSL'] == "true") {
|
||||||
$oidc->setVerifyHost(false);
|
$oidc->setVerifyHost(false);
|
||||||
|
|||||||
@@ -10,10 +10,6 @@
|
|||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Begin page content -->
|
|
||||||
<main role="main" class="flex-shrink-0">
|
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<?php
|
<?php
|
||||||
if (isset($alert)) {
|
if (isset($alert)) {
|
||||||
@@ -37,7 +33,11 @@
|
|||||||
<h1>Welcome to <?php echo($_ENV['APP_NAME']); ?></h1>
|
<h1>Welcome to <?php echo($_ENV['APP_NAME']); ?></h1>
|
||||||
<p class="lead text-muted">
|
<p class="lead text-muted">
|
||||||
<?php
|
<?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.
|
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>
|
</p>
|
||||||
@@ -80,7 +80,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<?php } } ?>
|
<?php
|
||||||
|
}
|
||||||
|
} ?>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -109,7 +111,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<?php } } ?>
|
<?php }
|
||||||
|
} ?>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
@@ -118,8 +121,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
require_once __DIR__ . "/../includes/footer.php";
|
require_once __DIR__ . "/../includes/footer.php";
|
||||||
?>
|
?>
|
||||||
|
|||||||
Reference in New Issue
Block a user