maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

update cron fpm config builder and webpack assets

Browse Source
This commit is contained in:
envoyr
2022-04-21 18:19:23 +02:00
parent 16c38b4066
commit cb7f180d8d
7 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -19,4 +19,5 @@ templates/*
!templates/Froxlor/ !templates/Froxlor/
templates/Froxlor/assets/css/ templates/Froxlor/assets/css/
templates/Froxlor/assets/js/ templates/Froxlor/assets/js/
templates/Froxlor/assets/webfonts/
!templates/misc/ !templates/misc/

19
lib/Froxlor/Cron/Http/Php/Fpm.php
View File

@@ -17,10 +17,10 @@ use Froxlor\Settings;
* @author Froxlor team <team@froxlor.org> (2010-) * @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Cron * @package Cron
* *
* @link http://www.nutime.de/ * @link http://www.nutime.de/
* @since 0.9.16 * @since 0.9.16
* *
*/ */
class Fpm class Fpm
{ {
@@ -244,13 +244,16 @@ class Fpm
$fpm_config .= "\n\n"; $fpm_config .= "\n\n";
foreach ($phpini_array as $inisection) { foreach ($phpini_array as $inisection) {
$is = explode("=", $inisection); $is = explode("=", $inisection);
if (count($is) !== 2 || empty($is[0])) {
continue;
}
foreach ($this->ini as $sec => $possibles) { foreach ($this->ini as $sec => $possibles) {
if (in_array(trim($is[0]), $possibles)) { if (in_array(trim($is[0]), $possibles)) {
// check explicitly for open_basedir // check explicitly for open_basedir
if (trim($is[0]) == 'open_basedir' && $openbasedir == '') { if (trim($is[0]) == 'open_basedir' && $openbasedir == '') {
continue; continue;
} }
$fpm_config .= $sec . '[' . trim($is[0]) . '] = ' . trim($is[1]) . "\n"; $fpm_config .= $sec . '[' . trim($is[0]) . '] = ' . trim($is[1] ?? '') . "\n";
} }
} }
} }
@@ -293,7 +296,7 @@ class Fpm
* *
* @param boolean $createifnotexists * @param boolean $createifnotexists
* create the directory if it does not exist * create the directory if it does not exist
* *
* @return string the full path to the file * @return string the full path to the file
*/ */
public function getConfigFile($createifnotexists = true) public function getConfigFile($createifnotexists = true)
@@ -313,7 +316,7 @@ class Fpm
* *
* @param boolean $createifnotexists * @param boolean $createifnotexists
* create the directory if it does not exist * create the directory if it does not exist
* *
* @return string the full path to the socket * @return string the full path to the socket
*/ */
public function getSocketFile($createifnotexists = true) public function getSocketFile($createifnotexists = true)
@@ -335,7 +338,7 @@ class Fpm
* *
* @param boolean $createifnotexists * @param boolean $createifnotexists
* create the directory if it does not exist * create the directory if it does not exist
* *
* @return string the directory * @return string the directory
*/ */
public function getTempDir($createifnotexists = true) public function getTempDir($createifnotexists = true)
@@ -356,7 +359,7 @@ class Fpm
* *
* @param boolean $createifnotexists * @param boolean $createifnotexists
* create the directory if it does not exist * create the directory if it does not exist
* *
* @return string the directory * @return string the directory
*/ */
public function getAliasConfigDir($createifnotexists = true) public function getAliasConfigDir($createifnotexists = true)
@@ -402,7 +405,7 @@ pm.max_children = 1
* *
* @param int $adminid * @param int $adminid
* id of the admin-user * id of the admin-user
* *
* @return array * @return array
*/ */
private function getAdminData($adminid) private function getAdminData($adminid)

5
mix-manifest.json
View File

@@ -1,5 +0,0 @@
{
"/templates/Froxlor/assets/js/main.js": "/templates/Froxlor/assets/js/main.js",
"/templates/Froxlor/assets/css/dark.css": "/templates/Froxlor/assets/css/dark.css",
"/templates/Froxlor/assets/css/main.css": "/templates/Froxlor/assets/css/main.css"
}

13
templates/Froxlor/assets/mix-manifest.json Normal file
View File

@@ -0,0 +1,13 @@
{
"/js/main.js": "/js/main.js",
"/css/dark.css": "/css/dark.css",
"/css/main.css": "/css/main.css",
"/webfonts/fa-brands-400.ttf": "/webfonts/fa-brands-400.ttf",
"/webfonts/fa-brands-400.woff2": "/webfonts/fa-brands-400.woff2",
"/webfonts/fa-regular-400.ttf": "/webfonts/fa-regular-400.ttf",
"/webfonts/fa-regular-400.woff2": "/webfonts/fa-regular-400.woff2",
"/webfonts/fa-solid-900.ttf": "/webfonts/fa-solid-900.ttf",
"/webfonts/fa-solid-900.woff2": "/webfonts/fa-solid-900.woff2",
"/webfonts/fa-v4compatibility.ttf": "/webfonts/fa-v4compatibility.ttf",
"/webfonts/fa-v4compatibility.woff2": "/webfonts/fa-v4compatibility.woff2"
}

1
templates/Froxlor/src/js/main.js
View File

@@ -1,5 +1,6 @@
// load bootstrap // load bootstrap
import 'bootstrap'; import 'bootstrap';
import '@fortawesome/fontawesome-free';
import 'chart.js/dist/chart'; import 'chart.js/dist/chart';
// load jquery // load jquery

1
templates/Froxlor/src/scss/main.scss
View File

@@ -3,6 +3,7 @@
// Bootstrap // Bootstrap
@import "variables/main"; @import "variables/main";
@import "~bootstrap/scss/bootstrap"; @import "~bootstrap/scss/bootstrap";
@import "~@fortawesome/fontawesome-free/scss/fontawesome";
// Theme // Theme
@import "global"; @import "global";

13
webpack.mix.js
View File

@@ -3,12 +3,11 @@
let mix = require('laravel-mix'); let mix = require('laravel-mix');
mix mix
.setPublicPath('') .setPublicPath('templates/Froxlor/assets')
.options({ .options({
fileLoaderDirs: { processCssUrls: false
fonts: 'templates/Froxlor/assets/fonts'
}
}) })
.js('templates/Froxlor/src/js/main.js', 'templates/Froxlor/assets/js') .copyDirectory('node_modules/@fortawesome/fontawesome-free/webfonts', 'templates/Froxlor/assets/webfonts')
.sass('templates/Froxlor/src/scss/main.scss', 'templates/Froxlor/assets/css') .js('templates/Froxlor/src/js/main.js', 'js')
.sass('templates/Froxlor/src/scss/dark.scss', 'templates/Froxlor/assets/css'); .sass('templates/Froxlor/src/scss/main.scss', 'css')
.sass('templates/Froxlor/src/scss/dark.scss', 'css');