Skip to content
Snippets Groups Projects
Commit 533de42a authored by latham's avatar latham
Browse files

microsoft line endings

parent b6a10a56
No related branches found
No related tags found
2 merge requests!46Master,!21Master
Hide whitespace changes
Inline Side-by-side
install/tpl/php_fpm_pool.conf.master
+ 15
− 15
View file @ 533de42a
[{fpm_pool}] [{fpm_pool}]
listen = 127.0.0.1:{fpm_port} listen = 127.0.0.1:{fpm_port}
listen.allowed_clients = 127.0.0.1 listen.allowed_clients = 127.0.0.1
user = {fpm_user} user = {fpm_user}
group = {fpm_group} group = {fpm_group}
pm = dynamic pm = dynamic
pm.max_children = 50 pm.max_children = 50
pm.start_servers = 20 pm.start_servers = 20
pm.min_spare_servers = 5 pm.min_spare_servers = 5
pm.max_spare_servers = 35 pm.max_spare_servers = 35
chdir = / chdir = /
\ No newline at end of file
interface/web/admin/templates/system_config_misc_edit.htm
+ 30
− 30
View file @ 533de42a
<h2><tmpl_var name="list_head_txt"></h2> <h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p> <p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_system_config"> <div class="panel panel_system_config">
<div class="pnl_formsarea"> <div class="pnl_formsarea">
<fieldset class="inlineLabels"><legend>Misc</legend> <fieldset class="inlineLabels"><legend>Misc</legend>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="dashboard_atom_url_admin">{tmpl_var name='dashboard_atom_url_admin_txt'}</label> <label for="dashboard_atom_url_admin">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
<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" /> <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" />
</div> </div>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="dashboard_atom_url_reseller">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label> <label for="dashboard_atom_url_reseller">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
<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" /> <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" />
</div> </div>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="dashboard_atom_url_client">{tmpl_var name='dashboard_atom_url_client_txt'}</label> <label for="dashboard_atom_url_client">{tmpl_var name='dashboard_atom_url_client_txt'}</label>
<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" /> <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" />
</div> </div>
<div class="ctrlHolder"> <div class="ctrlHolder">
<label for="monitor_key">{tmpl_var name='monitor_key_txt'}</label> <label for="monitor_key">{tmpl_var name='monitor_key_txt'}</label>
<input name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" type="text" class="textInput" /> <input name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" type="text" class="textInput" />
</div> </div>
</fieldset> </fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}"> <input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="buttonHolder buttons"> <div class="buttonHolder buttons">
<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> <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>
<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> <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>
</div> </div>
</div> </div>
</div> </div>
server/conf/php_fpm_pool.conf.master
+ 28
− 28
View file @ 533de42a
[<tmpl_var name='fpm_pool'>] [<tmpl_var name='fpm_pool'>]
<tmpl_var name='use_tcp'>listen = 127.0.0.1:<tmpl_var name='fpm_port'> <tmpl_var name='use_tcp'>listen = 127.0.0.1:<tmpl_var name='fpm_port'>
<tmpl_var name='use_tcp'>listen.allowed_clients = 127.0.0.1 <tmpl_var name='use_tcp'>listen.allowed_clients = 127.0.0.1
<tmpl_var name='use_socket'>listen = <tmpl_var name='fpm_socket'> <tmpl_var name='use_socket'>listen = <tmpl_var name='fpm_socket'>
<tmpl_var name='use_socket'>listen.owner = <tmpl_var name='fpm_user'> <tmpl_var name='use_socket'>listen.owner = <tmpl_var name='fpm_user'>
<tmpl_var name='use_socket'>listen.group = <tmpl_var name='fpm_group'> <tmpl_var name='use_socket'>listen.group = <tmpl_var name='fpm_group'>
<tmpl_var name='use_socket'>listen.mode = 0660 <tmpl_var name='use_socket'>listen.mode = 0660
user = <tmpl_var name='fpm_user'> user = <tmpl_var name='fpm_user'>
group = <tmpl_var name='fpm_group'> group = <tmpl_var name='fpm_group'>
pm = dynamic pm = dynamic
pm.max_children = 50 pm.max_children = 50
pm.start_servers = 20 pm.start_servers = 20
pm.min_spare_servers = 5 pm.min_spare_servers = 5
pm.max_spare_servers = 35 pm.max_spare_servers = 35
chdir = / chdir = /
<tmpl_if name='security_level' op='==' value='20'> <tmpl_if name='security_level' op='==' value='20'>
<tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'> <tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'>
</tmpl_if> </tmpl_if>
<tmpl_loop name="custom_php_ini_settings"> <tmpl_loop name="custom_php_ini_settings">
<tmpl_var name='ini_setting'> <tmpl_var name='ini_setting'>
</tmpl_loop> </tmpl_loop>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment