From c02d3f0464b0e7faa50ddd2ed2a20fe88cd60845 Mon Sep 17 00:00:00 2001 From: Falko Timme Date: Tue, 19 Nov 2013 23:25:45 +0100 Subject: [PATCH] - nginx: added {DOCROOT} and {FASTCGIPASS} placeholders to directive snippets and nginx Directives fields. --- .../admin/lib/lang/de_directive_snippets.lng | 1 + .../admin/lib/lang/en_directive_snippets.lng | 1 + .../templates/directive_snippets_edit.htm | 21 +++++++++++++++++-- .../web/sites/lib/lang/de_web_domain.lng | 1 + .../web/sites/lib/lang/en_web_domain.lng | 1 + .../sites/templates/web_domain_advanced.htm | 2 +- server/plugins-available/nginx_plugin.inc.php | 3 ++- 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/interface/web/admin/lib/lang/de_directive_snippets.lng b/interface/web/admin/lib/lang/de_directive_snippets.lng index 6c61c4636..e59368617 100644 --- a/interface/web/admin/lib/lang/de_directive_snippets.lng +++ b/interface/web/admin/lib/lang/de_directive_snippets.lng @@ -6,4 +6,5 @@ $wb['snippet_txt'] = 'Schnipsel'; $wb['active_txt'] = 'Aktiv'; $wb['directive_snippets_name_empty'] = 'Bitte geben Sie einen Namen für den Schnipsel an.'; $wb['directive_snippets_name_error_unique'] = 'Es existiert schon ein Direktiven-Schnipsel mit diesem Namen.'; +$wb['variables_txt'] = 'Variablen'; ?> \ No newline at end of file diff --git a/interface/web/admin/lib/lang/en_directive_snippets.lng b/interface/web/admin/lib/lang/en_directive_snippets.lng index ee40ab06f..9d9b0ae8e 100644 --- a/interface/web/admin/lib/lang/en_directive_snippets.lng +++ b/interface/web/admin/lib/lang/en_directive_snippets.lng @@ -6,4 +6,5 @@ $wb["snippet_txt"] = 'Snippet'; $wb["active_txt"] = 'Active'; $wb["directive_snippets_name_empty"] = 'Please specify a name for the snippet.'; $wb["directive_snippets_name_error_unique"] = 'There is already a directive snippet with this name.'; +$wb['variables_txt'] = 'Variables'; ?> \ No newline at end of file diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm index 0d57c06d5..6522eb1e4 100644 --- a/interface/web/admin/templates/directive_snippets_edit.htm +++ b/interface/web/admin/templates/directive_snippets_edit.htm @@ -17,7 +17,7 @@
- +
  {tmpl_var name='variables_txt'}: {DOCROOT}, {FASTCGIPASS}

{tmpl_var name='active_txt'}

@@ -35,4 +35,21 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng index 2494e7825..899a34dd3 100644 --- a/interface/web/sites/lib/lang/de_web_domain.lng +++ b/interface/web/sites/lib/lang/de_web_domain.lng @@ -120,4 +120,5 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Unzulässige Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Erlaubte Direktiven:'; $wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER'; +$wb['variables_txt'] = 'Variablen'; ?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index e4fb30e8b..ad32a9000 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -120,4 +120,5 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules'; $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules'; $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:'; $wb['configuration_error_txt'] = "CONFIGURATION ERROR"; +$wb['variables_txt'] = 'Variables'; ?> \ No newline at end of file diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm index 2f5136ebe..3cc7d2e81 100644 --- a/interface/web/sites/templates/web_domain_advanced.htm +++ b/interface/web/sites/templates/web_domain_advanced.htm @@ -84,7 +84,7 @@
-  {tmpl_var name="available_nginx_directive_snippets_txt"}

 {tmpl_var name="nginx_directive_snippets_txt"} +  {tmpl_var name="available_nginx_directive_snippets_txt"}

 {tmpl_var name="nginx_directive_snippets_txt"}
----
 {tmpl_var name='variables_txt'}: {DOCROOT}, {FASTCGIPASS}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 2e9394447..b49f2d246 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -1041,8 +1041,9 @@ class nginx_plugin { $nginx_directives = str_replace("\r", "\n", $nginx_directives); $nginx_directive_lines = explode("\n", $nginx_directives); if(is_array($nginx_directive_lines) && !empty($nginx_directive_lines)){ + $trans = array('{DOCROOT}' => $vhost_data['web_document_root_www'], '{FASTCGIPASS}' => 'fastcgi_pass '.($data['new']['php_fpm_use_socket'] == 'y'? 'unix:'.$fpm_socket : '127.0.0.1:'.$vhost_data['fpm_port']).';'); foreach($nginx_directive_lines as $nginx_directive_line){ - $final_nginx_directives[] = array('nginx_directive' => $nginx_directive_line); + $final_nginx_directives[] = array('nginx_directive' => strtr($nginx_directive_line, $trans)); } } $tpl->setLoop('nginx_directives', $final_nginx_directives); -- GitLab