Skip to content

Commit ea2ccf0

Browse files
authored
Merge pull request #3376 from jeedom/patch/remove-nginx-support
patch: remove nginx support
2 parents d983ef5 + ae1890d commit ea2ccf0

4 files changed

Lines changed: 2 additions & 91 deletions

File tree

core/class/log.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ private static function getActiveDaemonPluginIdsSortedByLength(): array {
243243
}
244244

245245
private static function canRemoveLog(string $_log): bool {
246-
if (strpos($_log, 'nginx.error') !== false || strpos($_log, 'http.error') !== false) {
246+
if (strpos($_log, 'http.error') !== false) {
247247
return false;
248248
}
249249

docs/fr_FR/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ bdd_password=$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 15)
103103
echo "DROP USER 'jeedom'@'localhost'" | mysql -uroot -p
104104
echo "CREATE USER 'jeedom'@'localhost' IDENTIFIED BY '${bdd_password}';" | mysql -uroot -p
105105
echo "GRANT ALL PRIVILEGES ON jeedom.* TO 'jeedom'@'localhost';" | mysql -uroot -p
106-
cd /usr/share/nginx/www/jeedom
106+
cd /var/www/html
107107
sudo cp core/config/common.config.sample.php core/config/common.config.php
108108
sudo sed -i -e "s/#PASSWORD#/${bdd_password}/g" core/config/common.config.php
109109
sudo chown www-data:www-data core/config/common.config.php

install/nginx_default

Lines changed: 0 additions & 78 deletions
This file was deleted.

tests/corsHeadersTest.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,6 @@ public function testHtaccessHasNoAllowCredentials() {
3737
);
3838
}
3939

40-
public function testNginxDefaultHasNoAllowCredentials() {
41-
$path = __DIR__ . '/../install/nginx_default';
42-
$this->assertFileExists($path);
43-
$content = file_get_contents($path);
44-
$this->assertDoesNotMatchRegularExpression(
45-
'/Access-Control-Allow-Credentials/i',
46-
$content,
47-
'nginx_default must not emit Access-Control-Allow-Credentials with Allow-Origin: *'
48-
);
49-
}
50-
5140
public function testJeeApiHasNoAllowCredentials() {
5241
$path = __DIR__ . '/../core/api/jeeApi.php';
5342
$this->assertFileExists($path);

0 commit comments

Comments
 (0)