From e146919f9d642b7d28ef2e9d905fc394f04f19f8 Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 27 Oct 2020 13:57:05 +0530 Subject: [PATCH 1/5] chore: Added semantic config Installed https://github.com/zeke/semantic-pull-requests and added config for repo --- .github/semantic.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/semantic.yml diff --git a/.github/semantic.yml b/.github/semantic.yml new file mode 100644 index 00000000..e1e53bc1 --- /dev/null +++ b/.github/semantic.yml @@ -0,0 +1,13 @@ +# Always validate the PR title AND all the commits +titleAndCommits: true + +# Allow use of Merge commits (eg on github: "Merge branch 'master' into feature/ride-unicorns") +# this is only relevant when using commitsOnly: true (or titleAndCommits: true) +allowMergeCommits: true + +# Allow use of Revert commits (eg on github: "Revert "feat: ride unicorns"") +# this is only relevant when using commitsOnly: true (or titleAndCommits: true) +allowRevertCommits: true + +# For allowed PR types: https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json +# Tool Reference: https://github.com/zeke/semantic-pull-requests From f17c579ffdbb82526acff00dea03e0b624c2bd81 Mon Sep 17 00:00:00 2001 From: Karan Sharma Date: Wed, 24 Oct 2018 16:41:05 +0530 Subject: [PATCH 2/5] build(config): Change default worker count --- bench/config/common_site_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bench/config/common_site_config.py b/bench/config/common_site_config.py index 02c6778a..d71d9efd 100644 --- a/bench/config/common_site_config.py +++ b/bench/config/common_site_config.py @@ -55,7 +55,7 @@ def get_gunicorn_workers(): '''This function will return the maximum workers that can be started depending upon number of cpu's present on the machine''' return { - "gunicorn_workers": multiprocessing.cpu_count() + "gunicorn_workers": multiprocessing.cpu_count() * 2 + 1 } def update_config_for_frappe(config, bench_path): From 482bb2e59182c11f66b45539d12414a366b5bb72 Mon Sep 17 00:00:00 2001 From: Hendy Irawan Date: Sat, 3 Oct 2020 23:58:18 +0700 Subject: [PATCH 3/5] build(install): Upgrade Ansible to 2.8.15 (or later patch version) --- install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.py b/install.py index 46ce4247..b5bd43f5 100644 --- a/install.py +++ b/install.py @@ -163,7 +163,7 @@ def install_prerequisites(): install_package('pip3', 'python3-pip') success = run_os_command({ - 'python3': "sudo -H python3 -m pip install --upgrade setuptools wheel cryptography ansible==2.8.5 pip" + 'python3': "sudo -H python3 -m pip install --upgrade setuptools wheel cryptography ansible~=2.8.15 pip" }) if not (success or shutil.which('ansible')): From 608b28c2460adf2b6ee1504b21a7e69dfdb06a1e Mon Sep 17 00:00:00 2001 From: Hendy Irawan Date: Sun, 4 Oct 2020 07:07:41 +0000 Subject: [PATCH 4/5] fix(install): Obey --without-site --- bench/playbooks/roles/bench/tasks/setup_erpnext.yml | 5 +++-- install.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bench/playbooks/roles/bench/tasks/setup_erpnext.yml b/bench/playbooks/roles/bench/tasks/setup_erpnext.yml index 32e498d1..9db153ab 100644 --- a/bench/playbooks/roles/bench/tasks/setup_erpnext.yml +++ b/bench/playbooks/roles/bench/tasks/setup_erpnext.yml @@ -13,16 +13,17 @@ - name: Check whether the site already exists stat: path="{{ bench_path }}/sites/{{ site }}" register: site_folder + when: not without_site - name: Create a new site command: "bench new-site {{ site }} --admin-password '{{ admin_password }}' --mariadb-root-password '{{ mysql_root_password }}'" args: 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 command: "bench --site {{ site }} install-app erpnext" args: chdir: "{{ bench_path }}" - when: not without_erpnext + when: not without_site and not without_erpnext ... \ No newline at end of file diff --git a/install.py b/install.py index 46ce4247..8a08c1db 100644 --- a/install.py +++ b/install.py @@ -327,8 +327,8 @@ def get_passwords(args): mysql_root_password = '' continue - # admin password - if not admin_password: + # admin password, only needed if we're also creating a site + if not admin_password and not args.without_site: admin_password = getpass.unix_getpass(prompt='Please enter the default Administrator user password: ') conf_admin_passswd = getpass.unix_getpass(prompt='Re-enter Administrator password: ') From f2e7702fdefe30ee8d0546da5dc09e9042f7f570 Mon Sep 17 00:00:00 2001 From: Adam Tang <37611541+adamtang79@users.noreply.github.com> Date: Wed, 28 Oct 2020 09:04:41 +0800 Subject: [PATCH 5/5] fix: utf8mb4_general_ci fix: prevent error while bench new-site --- bench/playbooks/roles/mariadb/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bench/playbooks/roles/mariadb/tasks/main.yml b/bench/playbooks/roles/mariadb/tasks/main.yml index 1f119005..8079583d 100644 --- a/bench/playbooks/roles/mariadb/tasks/main.yml +++ b/bench/playbooks/roles/mariadb/tasks/main.yml @@ -48,6 +48,10 @@ [mysqld] pid-file = /var/run/mysqld/mysqld.pid 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 become: yes become_user: root