accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 00:06:36 +00:00
Code Issues Releases Activity

Merge branch 'develop' into patch-5

Browse Source
This commit is contained in:
gavin 2020-10-28 14:10:02 +05:30 committed by GitHub
commit 6ba5198dc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/config/common_site_config.py
View File

@ -55,7 +55,7 @@ def get_gunicorn_workers():
'''This function will return the maximum workers that can be started depending upon '''This function will return the maximum workers that can be started depending upon
number of cpu's present on the machine''' number of cpu's present on the machine'''
return { return {
"gunicorn_workers": multiprocessing.cpu_count() "gunicorn_workers": multiprocessing.cpu_count() * 2 + 1
} }
def update_config_for_frappe(config, bench_path): def update_config_for_frappe(config, bench_path):

5
bench/playbooks/roles/bench/tasks/setup_erpnext.yml
View File

@ -13,16 +13,17 @@
- name: Check whether the site already exists - name: Check whether the site already exists
stat: path="{{ bench_path }}/sites/{{ site }}" stat: path="{{ bench_path }}/sites/{{ site }}"
register: site_folder register: site_folder
when: not without_site
- name: Create a new site - name: Create a new site
command: "bench new-site {{ site }} --admin-password '{{ admin_password }}' --mariadb-root-password '{{ mysql_root_password }}'" command: "bench new-site {{ site }} --admin-password '{{ admin_password }}' --mariadb-root-password '{{ mysql_root_password }}'"
args: args:
chdir: "{{ bench_path }}" chdir: "{{ bench_path }}"
when: not site_folder.stat.exists when: not without_site and not site_folder.stat.exists
- name: Install ERPNext to default site - name: Install ERPNext to default site
command: "bench --site {{ site }} install-app erpnext" command: "bench --site {{ site }} install-app erpnext"
args: args:
chdir: "{{ bench_path }}" chdir: "{{ bench_path }}"
when: not without_erpnext when: not without_site and not without_erpnext
... ...

4
bench/playbooks/roles/mariadb/tasks/main.yml
View File

@ -48,6 +48,10 @@
[mysqld] [mysqld]
pid-file = /var/run/mysqld/mysqld.pid pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock socket = /var/run/mysqld/mysqld.sock
# setting appeared inside mysql but overwritten by mariadb inside mariadb.conf.d/xx-server.cnf valued as utf8mb4_general_ci
collation-server = utf8mb4_unicode_ci
create: yes create: yes
become: yes become: yes
become_user: root become_user: root

4
install.py
View File

@ -327,8 +327,8 @@ def get_passwords(args):
mysql_root_password = '' mysql_root_password = ''
continue continue
# admin password # admin password, only needed if we're also creating a site
if not admin_password: if not admin_password and not args.without_site:
admin_password = getpass.unix_getpass(prompt='Please enter the default Administrator user password: ') admin_password = getpass.unix_getpass(prompt='Please enter the default Administrator user password: ')
conf_admin_passswd = getpass.unix_getpass(prompt='Re-enter Administrator password: ') conf_admin_passswd = getpass.unix_getpass(prompt='Re-enter Administrator password: ')