Compare commits
No commits in common. "main" and "preprod" have entirely different histories.
6 changed files with 7 additions and 27 deletions
|
|
@ -62,12 +62,3 @@ jobs:
|
||||||
sshpass -p "$PASSWORD" rsync -az --delete -O \
|
sshpass -p "$PASSWORD" rsync -az --delete -O \
|
||||||
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
|
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
|
||||||
assets/ $USERNAME@$HOST:$PREPROD_PATH/assets/
|
assets/ $USERNAME@$HOST:$PREPROD_PATH/assets/
|
||||||
|
|
||||||
echo "Deploying .user.ini"
|
|
||||||
sshpass -p "$PASSWORD" rsync -az -O \
|
|
||||||
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
|
|
||||||
.user.ini $USERNAME@$HOST:$PREPROD_PATH/.user.ini
|
|
||||||
|
|
||||||
echo "Fix ACL mask on writable directories"
|
|
||||||
sshpass -p "$PASSWORD" ssh -p 2244 -o StrictHostKeyChecking=no $USERNAME@$HOST \
|
|
||||||
"setfacl -m mask::rwx $PREPROD_PATH/site/accounts $PREPROD_PATH/site/cache $PREPROD_PATH/site/sessions $PREPROD_PATH/content $PREPROD_PATH/media"
|
|
||||||
|
|
|
||||||
|
|
@ -62,12 +62,3 @@ jobs:
|
||||||
sshpass -p "$PASSWORD" rsync -az --delete -O \
|
sshpass -p "$PASSWORD" rsync -az --delete -O \
|
||||||
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
|
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
|
||||||
assets/ $USERNAME@$HOST:$PROD_PATH/assets/
|
assets/ $USERNAME@$HOST:$PROD_PATH/assets/
|
||||||
|
|
||||||
echo "Deploying .user.ini"
|
|
||||||
sshpass -p "$PASSWORD" rsync -az -O \
|
|
||||||
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
|
|
||||||
.user.ini $USERNAME@$HOST:$PROD_PATH/.user.ini
|
|
||||||
|
|
||||||
echo "Fix ACL mask on writable directories"
|
|
||||||
sshpass -p "$PASSWORD" ssh -p 2244 -o StrictHostKeyChecking=no $USERNAME@$HOST \
|
|
||||||
"setfacl -m mask::rwx $PROD_PATH/site/accounts $PROD_PATH/site/cache $PROD_PATH/site/sessions $PROD_PATH/content $PROD_PATH/media"
|
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ deploy_preprod:
|
||||||
build_prod:
|
build_prod:
|
||||||
stage: build
|
stage: build
|
||||||
only:
|
only:
|
||||||
- main
|
- prod
|
||||||
image: composer:2
|
image: composer:2
|
||||||
script:
|
script:
|
||||||
- apk add --no-cache nodejs npm
|
- apk add --no-cache nodejs npm
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ return [
|
||||||
'pattern' => 'migrate-user-projects.json',
|
'pattern' => 'migrate-user-projects.json',
|
||||||
'method' => 'POST',
|
'method' => 'POST',
|
||||||
'action' => function () {
|
'action' => function () {
|
||||||
ini_set('memory_limit', '512M');
|
|
||||||
$user = kirby()->user();
|
$user = kirby()->user();
|
||||||
|
|
||||||
if (!$user || $user->role()->id() !== 'admin') {
|
if (!$user || $user->role()->id() !== 'admin') {
|
||||||
|
|
|
||||||
|
|
@ -11,12 +11,11 @@ function getProjectData($project, $user)
|
||||||
{
|
{
|
||||||
// Utiliser getNotificationsLight() avec cache pour optimiser les performances
|
// Utiliser getNotificationsLight() avec cache pour optimiser les performances
|
||||||
$notifications = [];
|
$notifications = [];
|
||||||
if ($project instanceof ProjectPage) {
|
try {
|
||||||
try {
|
$notifications = $project->getNotificationsLight($user);
|
||||||
$notifications = $project->getNotificationsLight($user);
|
} catch (\Throwable $e) {
|
||||||
} catch (\Throwable $e) {
|
error_log("Error getting notifications for project {$project->uri()}: " . $e->getMessage());
|
||||||
error_log("Error getting notifications for project {$project->uri()}: " . $e->getMessage());
|
$notifications = [];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ export default defineConfig(({ mode }) => {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
sourcemap: mode === 'staging',
|
sourcemap: mode === 'staging',
|
||||||
minify: mode === 'production',
|
minify: mode === 'production' ? 'esbuild' : false,
|
||||||
},
|
},
|
||||||
server: {
|
server: {
|
||||||
cors: true,
|
cors: true,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue