Skip to content

Commit 533de42

Browse files
author
latham
committed
microsoft line endings
1 parent b6a10a5 commit 533de42

File tree

3 files changed

+73
-73
lines changed

3 files changed

+73
-73
lines changed

‎install/tpl/php_fpm_pool.conf.master‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
[{fpm_pool}]
2-
3-
listen = 127.0.0.1:{fpm_port}
4-
5-
listen.allowed_clients = 127.0.0.1
6-
7-
user = {fpm_user}
8-
group = {fpm_group}
9-
10-
pm = dynamic
11-
pm.max_children = 50
12-
pm.start_servers = 20
13-
pm.min_spare_servers = 5
14-
pm.max_spare_servers = 35
15-
1+
[{fpm_pool}]
2+
3+
listen = 127.0.0.1:{fpm_port}
4+
5+
listen.allowed_clients = 127.0.0.1
6+
7+
user = {fpm_user}
8+
group = {fpm_group}
9+
10+
pm = dynamic
11+
pm.max_children = 50
12+
pm.start_servers = 20
13+
pm.min_spare_servers = 5
14+
pm.max_spare_servers = 35
15+
1616
chdir = /

‎interface/web/admin/templates/system_config_misc_edit.htm‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
<p><tmpl_var name="list_desc_txt"></p>
3-
4-
<div class="panel panel_system_config">
5-
<div class="pnl_formsarea">
6-
<fieldset class="inlineLabels"><legend>Misc</legend>
7-
<div class="ctrlHolder">
8-
<label for="dashboard_atom_url_admin">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
9-
<input name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" type="text" class="textInput" />
10-
</div>
11-
<div class="ctrlHolder">
12-
<label for="dashboard_atom_url_reseller">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
13-
<input name="dashboard_atom_url_reseller" id="dashboard_atom_url_reseller" value="{tmpl_var name='dashboard_atom_url_reseller'}" size="" maxlength="" type="text" class="textInput" />
14-
</div>
15-
<div class="ctrlHolder">
16-
<label for="dashboard_atom_url_client">{tmpl_var name='dashboard_atom_url_client_txt'}</label>
17-
<input name="dashboard_atom_url_client" id="dashboard_atom_url_client" value="{tmpl_var name='dashboard_atom_url_client'}" size="" maxlength="" type="text" class="textInput" />
18-
</div>
19-
<div class="ctrlHolder">
20-
<label for="monitor_key">{tmpl_var name='monitor_key_txt'}</label>
21-
<input name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" type="text" class="textInput" />
22-
</div>
23-
</fieldset>
24-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
25-
<div class="buttonHolder buttons">
26-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
27-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
28-
</div>
29-
</div>
30-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
<p><tmpl_var name="list_desc_txt"></p>
3+
4+
<div class="panel panel_system_config">
5+
<div class="pnl_formsarea">
6+
<fieldset class="inlineLabels"><legend>Misc</legend>
7+
<div class="ctrlHolder">
8+
<label for="dashboard_atom_url_admin">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
9+
<input name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" type="text" class="textInput" />
10+
</div>
11+
<div class="ctrlHolder">
12+
<label for="dashboard_atom_url_reseller">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
13+
<input name="dashboard_atom_url_reseller" id="dashboard_atom_url_reseller" value="{tmpl_var name='dashboard_atom_url_reseller'}" size="" maxlength="" type="text" class="textInput" />
14+
</div>
15+
<div class="ctrlHolder">
16+
<label for="dashboard_atom_url_client">{tmpl_var name='dashboard_atom_url_client_txt'}</label>
17+
<input name="dashboard_atom_url_client" id="dashboard_atom_url_client" value="{tmpl_var name='dashboard_atom_url_client'}" size="" maxlength="" type="text" class="textInput" />
18+
</div>
19+
<div class="ctrlHolder">
20+
<label for="monitor_key">{tmpl_var name='monitor_key_txt'}</label>
21+
<input name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" type="text" class="textInput" />
22+
</div>
23+
</fieldset>
24+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
25+
<div class="buttonHolder buttons">
26+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
27+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
28+
</div>
29+
</div>
30+
</div>

‎server/conf/php_fpm_pool.conf.master‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
[<tmpl_var name='fpm_pool'>]
2-
3-
<tmpl_var name='use_tcp'>listen = 127.0.0.1:<tmpl_var name='fpm_port'>
4-
<tmpl_var name='use_tcp'>listen.allowed_clients = 127.0.0.1
5-
6-
<tmpl_var name='use_socket'>listen = <tmpl_var name='fpm_socket'>
7-
<tmpl_var name='use_socket'>listen.owner = <tmpl_var name='fpm_user'>
8-
<tmpl_var name='use_socket'>listen.group = <tmpl_var name='fpm_group'>
9-
<tmpl_var name='use_socket'>listen.mode = 0660
10-
11-
user = <tmpl_var name='fpm_user'>
12-
group = <tmpl_var name='fpm_group'>
13-
14-
pm = dynamic
15-
pm.max_children = 50
16-
pm.start_servers = 20
17-
pm.min_spare_servers = 5
18-
pm.max_spare_servers = 35
19-
20-
chdir = /
21-
22-
<tmpl_if name='security_level' op='==' value='20'>
23-
24-
<tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'>
25-
</tmpl_if>
26-
27-
<tmpl_loop name="custom_php_ini_settings">
28-
<tmpl_var name='ini_setting'>
1+
[<tmpl_var name='fpm_pool'>]
2+
3+
<tmpl_var name='use_tcp'>listen = 127.0.0.1:<tmpl_var name='fpm_port'>
4+
<tmpl_var name='use_tcp'>listen.allowed_clients = 127.0.0.1
5+
6+
<tmpl_var name='use_socket'>listen = <tmpl_var name='fpm_socket'>
7+
<tmpl_var name='use_socket'>listen.owner = <tmpl_var name='fpm_user'>
8+
<tmpl_var name='use_socket'>listen.group = <tmpl_var name='fpm_group'>
9+
<tmpl_var name='use_socket'>listen.mode = 0660
10+
11+
user = <tmpl_var name='fpm_user'>
12+
group = <tmpl_var name='fpm_group'>
13+
14+
pm = dynamic
15+
pm.max_children = 50
16+
pm.start_servers = 20
17+
pm.min_spare_servers = 5
18+
pm.max_spare_servers = 35
19+
20+
chdir = /
21+
22+
<tmpl_if name='security_level' op='==' value='20'>
23+
24+
<tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'>
25+
</tmpl_if>
26+
27+
<tmpl_loop name="custom_php_ini_settings">
28+
<tmpl_var name='ini_setting'>
2929
</tmpl_loop>

0 commit comments

Comments
 (0)