microsoft line endings

latham

2011-09-22 533de42affcf6b0b0686e237c20b7c667c0b6964

microsoft line endings

 install/tpl/php_fpm_pool.conf.master

@@ -1,16 +1,16 @@
[{fpm_pool}]



listen = 127.0.0.1:{fpm_port}



listen.allowed_clients = 127.0.0.1



user = {fpm_user}

group = {fpm_group}



pm = dynamic

pm.max_children = 50

pm.start_servers = 20

pm.min_spare_servers = 5

pm.max_spare_servers = 35



[{fpm_pool}]

listen = 127.0.0.1:{fpm_port}

listen.allowed_clients = 127.0.0.1

user = {fpm_user}
group = {fpm_group}

pm = dynamic
pm.max_children = 50
pm.start_servers = 20
pm.min_spare_servers = 5
pm.max_spare_servers = 35

chdir = /

 interface/web/admin/templates/system_config_misc_edit.htm

@@ -1,30 +1,30 @@
<h2><tmpl_var name="list_head_txt"></h2>

<p><tmpl_var name="list_desc_txt"></p>



<div class="panel panel_system_config">

    <div class="pnl_formsarea">

        <fieldset class="inlineLabels"><legend>Misc</legend>

            <div class="ctrlHolder">

                <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" />

            </div>

            <div class="ctrlHolder">

                <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" />

            </div>

            <div class="ctrlHolder">

                <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" />

            </div>

            <div class="ctrlHolder">

                <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" />

            </div>

        </fieldset>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">

        <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="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>

<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>

<div class="panel panel_system_config">
    <div class="pnl_formsarea">
        <fieldset class="inlineLabels"><legend>Misc</legend>
            <div class="ctrlHolder">
                <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" />
            </div>
            <div class="ctrlHolder">
                <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" />
            </div>
            <div class="ctrlHolder">
                <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" />
            </div>
            <div class="ctrlHolder">
                <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" />
            </div>
        </fieldset>
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <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="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>

 server/conf/php_fpm_pool.conf.master

@@ -1,29 +1,29 @@
[<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.allowed_clients = 127.0.0.1



<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.group = <tmpl_var name='fpm_group'>

<tmpl_var name='use_socket'>listen.mode = 0660



user = <tmpl_var name='fpm_user'>

group = <tmpl_var name='fpm_group'>



pm = dynamic

pm.max_children = 50

pm.start_servers = 20

pm.min_spare_servers = 5

pm.max_spare_servers = 35



chdir = /



<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_if>



<tmpl_loop name="custom_php_ini_settings">

<tmpl_var name='ini_setting'>

[<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.allowed_clients = 127.0.0.1

<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.group = <tmpl_var name='fpm_group'>
<tmpl_var name='use_socket'>listen.mode = 0660

user = <tmpl_var name='fpm_user'>
group = <tmpl_var name='fpm_group'>

pm = dynamic
pm.max_children = 50
pm.start_servers = 20
pm.min_spare_servers = 5
pm.max_spare_servers = 35

chdir = /

<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_if>

<tmpl_loop name="custom_php_ini_settings">
<tmpl_var name='ini_setting'>
</tmpl_loop>