Set the PHP server config per site (#232)

* Set up the php server per site.

* Backwards compatibility logic for old config URLs.

* Remove php global config tab.

* Fix util import in website.conf.js

* Fix eslint fails.

* Move global php i18n keys to domain

* Remove unnecessary domains verification and set fastcgi_pass in unified mode.

* Convert return statement to logic operator in php_ustream.js

* Move php upstream to outside the server blocks

* Remove unnecessary watcher from php domain section

* Fix upstream config context and conditional append

* Separate backwards compatibility logic.

* Remove unused i18n key from php domain and update copyright of these files

* Replace all dots for underscore in php_upstream helper

* Fix missing space and remove upstream comment from php config.

* Fix selects $refs and watch the enable status for phpServer and phpBackupServer.

* Change copyright year for all modified files.

* Backwards compatibility logic for old config URLs after angularBackwardsCompatibility

* Deep merge old php global config from data url, and add safe disable for phpConfigs

* Move deep merge function to new helper

* Fix missing disable wordpressRules  and convert function declaration to arrows in deep merge helper

* Fix missing css class in php domain-section
This commit is contained in:
Atila Silva
2021-02-24 13:20:10 -03:00
committed by GitHub
parent 4cfdcdb8d1
commit 1fb756ca77
29 changed files with 385 additions and 507 deletions

View File

@@ -1,5 +1,5 @@
/*
Copyright 2020 DigitalOcean
Copyright 2021 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -39,4 +39,18 @@ export default {
enableMagentoRules: `${common.enable} regras específicas do ${common.magento}`,
joomlaRules: `Regras do ${common.joomla}`,
enableJoomlaRules: `${common.enable} regras específicas do ${common.joomla}`,
phpServer: `Servidor ${common.php}`,
phpBackupServer: `Servidor de backup ${common.php}`,
tcp: 'TCP',
hhvmSocket: 'Socket HHVM',
php5Socket: 'Socket 5.x',
php70Socket: 'Socket 7.0',
php71Socket: 'Socket 7.1',
php72Socket: 'Socket 7.2',
php73Socket: 'Socket 7.3',
php74Socket: 'Socket 7.4',
php80Socket: 'Socket 8.0',
phpSocket: 'Socket PHP',
custom: 'Custom', // TODO: translate
disabled: 'Desabilitado',
};

View File

@@ -1,5 +1,5 @@
/*
Copyright 2020 DigitalOcean
Copyright 2021 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -28,11 +28,10 @@ import https from './https';
import logging from './logging';
import nginx from './nginx';
import performance from './performance';
import php from './php';
import python from './python';
import reverseProxy from './reverse_proxy';
import security from './security';
import tools from './tools';
import docker from './docker';
export default { https, logging, nginx, performance, php, python, reverseProxy, security, tools, docker };
export default { https, logging, nginx, performance, python, reverseProxy, security, tools, docker };

View File

@@ -1,45 +0,0 @@
/*
Copyright 2021 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import common from '../../common';
export default {
phpServer: `Servidor ${common.php}`,
phpMustBeEnabledOnOneSite: `O ${common.php} deve estar habilitado em pelo menos um site para definir as configurações globais do ${common.php}.`,
phpBackupServer: `Servidor de backup ${common.php}`,
tcp: 'TCP',
hhvmSocket: 'Socket HHVM',
php5Socket: 'Socket 5.x',
php70Socket: 'Socket 7.0',
php71Socket: 'Socket 7.1',
php72Socket: 'Socket 7.2',
php73Socket: 'Socket 7.3',
php74Socket: 'Socket 7.4',
php80Socket: 'Socket 8.0',
phpSocket: 'Socket PHP',
custom: 'Custom', // TODO: translate
disabled: 'Desabilitado',
};