standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-04 22:00:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Style tweaks

Browse source
This commit is contained in:
Alex Cabal 2024-11-26 11:12:19 -06:00
parent a7857cab1b
commit 99f49d7f51
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/reset-php-fpm-opcache
View file

@ -27,5 +27,5 @@ fi
# MY_USERNAME ALL=(www-data) NOPASSWD: /usr/bin/env SCRIPT_FILENAME=/tmp/php-fpm-opcache-reset.php REQUEST_METHOD=GET cgi-fcgi -bind -connect * # MY_USERNAME ALL=(www-data) NOPASSWD: /usr/bin/env SCRIPT_FILENAME=/tmp/php-fpm-opcache-reset.php REQUEST_METHOD=GET cgi-fcgi -bind -connect *
echo '<?php opcache_reset();?>' > /tmp/php-fpm-opcache-reset.php echo '<?php opcache_reset();?>' > /tmp/php-fpm-opcache-reset.php
sudo --user www-data env SCRIPT_FILENAME=/tmp/php-fpm-opcache-reset.php REQUEST_METHOD=GET cgi-fcgi -bind -connect "/run/php/$1.sock" &> /dev/null sudo --user=www-data env SCRIPT_FILENAME=/tmp/php-fpm-opcache-reset.php REQUEST_METHOD=GET cgi-fcgi -bind -connect "/run/php/$1.sock" &> /dev/null
rm /tmp/php-fpm-opcache-reset.php rm /tmp/php-fpm-opcache-reset.php

15
www/webhooks/github.php
View file

@ -1,12 +1,14 @@
<? <?
/**
* This script makes various calls to external scripts using `exec()` (and when called via Apache, as the `www-data` user).
* These scripts are allowed using the `/etc/sudoers.d/www-data` file. Only the specific scripts in that file may be executed by this script.
*/
use function Safe\exec; use function Safe\exec;
use function Safe\file_get_contents; use function Safe\file_get_contents;
use function Safe\json_decode; use function Safe\json_decode;
use function Safe\glob; use function Safe\glob;
use function Safe\shell_exec; use function Safe\shell_exec;
// This script makes various calls to external scripts using exec() (and when called via Apache, as the www-data user).
// These scripts are allowed using the /etc/sudoers.d/www-data file. Only the specific scripts in that file may be executed by this script.
try{ try{
$log = new Log(GITHUB_WEBHOOK_LOG_FILE_PATH); $log = new Log(GITHUB_WEBHOOK_LOG_FILE_PATH);
$lastPushHashFlag = ''; $lastPushHashFlag = '';
@ -61,7 +63,7 @@ try{
// Get the filesystem path for the ebook. // Get the filesystem path for the ebook.
$dir = REPOS_PATH . '/' . $repoName . '.git'; $dir = REPOS_PATH . '/' . $repoName . '.git';
// Confirm we're looking at a Git repo in our filesystem // Confirm we're looking at a Git repo in our filesystem.
if(!file_exists($dir . '/HEAD')){ if(!file_exists($dir . '/HEAD')){
// We might be looking for a repo whose name is so long, it was truncated for GitHub. Try to check that here by simply globbing the rest. // We might be looking for a repo whose name is so long, it was truncated for GitHub. Try to check that here by simply globbing the rest.
$dirs = glob(REPOS_PATH . '/' . $repoName . '*'); $dirs = glob(REPOS_PATH . '/' . $repoName . '*');
@ -94,7 +96,7 @@ try{
// Get the current HEAD hash and save for later. // Get the current HEAD hash and save for later.
$output = []; $output = [];
exec('sudo --set-home --user se-vcs-bot git -C ' . escapeshellarg($dir) . ' rev-parse HEAD', $output, $returnCode); exec('sudo --set-home --user=se-vcs-bot git -C ' . escapeshellarg($dir) . ' rev-parse HEAD', $output, $returnCode);
if($returnCode != 0){ if($returnCode != 0){
$log->Write('Couldn\'t get last commit of local repo. Output: ' . implode("\n", $output)); $log->Write('Couldn\'t get last commit of local repo. Output: ' . implode("\n", $output));
} }
@ -104,7 +106,7 @@ try{
// Now that we have the ebook filesystem path, pull the latest commit from GitHub. // Now that we have the ebook filesystem path, pull the latest commit from GitHub.
$output = []; $output = [];
exec('sudo --set-home --user se-vcs-bot ' . SITE_ROOT . '/scripts/pull-from-github ' . escapeshellarg($dir) . ' 2>&1', $output, $returnCode); exec('sudo --set-home --user=se-vcs-bot ' . SITE_ROOT . '/scripts/pull-from-github ' . escapeshellarg($dir) . ' 2>&1', $output, $returnCode);
if($returnCode != 0){ if($returnCode != 0){
$log->Write('Error pulling from GitHub. Output: ' . implode("\n", $output)); $log->Write('Error pulling from GitHub. Output: ' . implode("\n", $output));
throw new Exceptions\WebhookException('Couldn\'t process ebook.', $post); throw new Exceptions\WebhookException('Couldn\'t process ebook.', $post);
@ -115,7 +117,7 @@ try{
// Our local repo is now updated. Build the ebook! // Our local repo is now updated. Build the ebook!
$output = []; $output = [];
exec('sudo --set-home --user se-vcs-bot tsp ' . SITE_ROOT . '/web/scripts/deploy-ebook-to-www' . $lastPushHashFlag . ' ' . escapeshellarg($dir) . ' 2>&1', $output, $returnCode); exec('sudo --set-home --user=se-vcs-bot tsp ' . SITE_ROOT . '/web/scripts/deploy-ebook-to-www' . $lastPushHashFlag . ' ' . escapeshellarg($dir) . ' 2>&1', $output, $returnCode);
if($returnCode != 0){ if($returnCode != 0){
$log->Write('Error queueing ebook for deployment to web. Output: ' . implode("\n", $output)); $log->Write('Error queueing ebook for deployment to web. Output: ' . implode("\n", $output));
throw new Exceptions\WebhookException('Couldn\'t process ebook.', $post); throw new Exceptions\WebhookException('Couldn\'t process ebook.', $post);
@ -151,4 +153,3 @@ catch(Exceptions\NoopException){
http_response_code(Enums\HttpCode::NoContent->value); http_response_code(Enums\HttpCode::NoContent->value);
} }
?>