From 8b0d8b10633da0b58f1e210e3a3570be5a93ee59 Mon Sep 17 00:00:00 2001 From: Graham Herceg Date: Thu, 14 Nov 2024 10:23:52 -0500 Subject: [PATCH 1/3] Ubuntu 22.04 comes with Python 3.10 This was applicable when still on 18.04, but is no longer necessary. This is a logical followup to adb70d99284fd66dcc0d6eb6b5d9bc4d487a52a3. --- docs/source/installation/1-quick-monolith-install.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/source/installation/1-quick-monolith-install.rst b/docs/source/installation/1-quick-monolith-install.rst index 40419852f2..58a653a397 100644 --- a/docs/source/installation/1-quick-monolith-install.rst +++ b/docs/source/installation/1-quick-monolith-install.rst @@ -11,7 +11,6 @@ Prerequisites - A single Ubuntu 22.04 64-bit server - Root user to SSH into the server - git must be installed on the server. If not, please use https://github.com/git-guides/install-git#debianubuntu to install git -- We recommend using Python 3.10 with commcare-cloud. Follow instructions at https://commcare-cloud.readthedocs.io/en/latest/installation/2-manual-install.html#upgrade-to-python-3-10 to upgrade. Installation Steps ------------------ From c026f9289d5aa232fd69079fdee118152a85a316 Mon Sep 17 00:00:00 2001 From: Graham Herceg Date: Thu, 14 Nov 2024 11:06:49 -0500 Subject: [PATCH 2/3] Fix private interface task --- quick_monolith_install/bootstrap-env-playbook.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quick_monolith_install/bootstrap-env-playbook.yml b/quick_monolith_install/bootstrap-env-playbook.yml index 69867a0b77..0f292f4c3c 100644 --- a/quick_monolith_install/bootstrap-env-playbook.yml +++ b/quick_monolith_install/bootstrap-env-playbook.yml @@ -33,7 +33,7 @@ until: "'ansible_{{result_external_interface.user_input}}' in hostvars[inventory_hostname]" retries: 3 delay: 0 - - name: 'Private inerface' + - name: 'Private interface' pause: prompt: | Found multiple network interfaces. @@ -42,7 +42,7 @@ IP Address: {{hostvars[inventory_hostname]['ansible_%s' | format(interface)]['ipv4']['address'] }}, Interface Name: {{ interface}} {% endfor%} - Please enter the private interface name to be used from above three. + Please enter the private interface name to be used from the above options. This will be used to set firewall rules register: result_internal_interface until: "result_internal_interface.user_input in ansible_interfaces" From 1b103f81b660a710d36c51c1392747f01dd5de3a Mon Sep 17 00:00:00 2001 From: Graham Herceg Date: Thu, 14 Nov 2024 11:09:50 -0500 Subject: [PATCH 3/3] Minor changes to final output of cchq-install.sh --- quick_monolith_install/cchq-install.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/quick_monolith_install/cchq-install.sh b/quick_monolith_install/cchq-install.sh index 7683556b5e..09cc281316 100755 --- a/quick_monolith_install/cchq-install.sh +++ b/quick_monolith_install/cchq-install.sh @@ -79,15 +79,15 @@ source ~/.commcare-cloud/load_config.sh commcare-cloud $env_name update-local-known-hosts commcare-cloud $env_name bootstrap-users -c local --quiet -printf "\nEverything is setup to install CommCareHQ now! Would you like to install CommCareHQ now?\n" -printf "Please see below a summary of what this script has setup so far!\n" -printf "1. Installed commcare-cloud, the tool to deploy and manage your CommCareHQ instance.\n" -printf "2. Users ansible and $ssh_username are created with SSH and sudo access.\n" -printf "3. A configuration directory created for your CommCareHQ environment at: $HOME/environments/$env_name.\n" -printf " This directory has all the configuration and the encrypted vault file containing passwords.\n" -printf " The vault file also has the sudo password for the ansible user under the key ansible_sudo_pass\n\n" +printf "\ncommcare-cloud setup is complete!\n\n" +printf "Here is a summary of what this script has setup:\n" +printf "1. Installed commcare-cloud, the tool to deploy and manage your CommCare HQ instance.\n" +printf "2. The users ansible and $ssh_username were created with SSH and sudo access.\n" +printf "3. A configuration directory was created for your CommCare HQ environment in $HOME/environments/$env_name.\n" +printf " In addition to configuration for your environment, this directory contains the encrypted vault file with passwords.\n" +printf " The vault file also has the sudo password for the ansible user under the key ansible_sudo_pass\n\n" -printf "You can now install CommCareHQ using below two commands.\n\n" +printf "You can now install CommCare HQ using below two commands.\n\n" printf "source ~/.commcare-cloud/load_config.sh\n" printf "commcare-cloud $env_name deploy-stack --skip-check --skip-tags=users -e 'CCHQ_IS_FRESH_INSTALL=1' -c local \n\n" printf "Would you like the above command to be run now?\n" @@ -100,7 +100,7 @@ else exit fi -printf "\nSuccessfully installed all the required services for CommCareHQ instance!\n" +printf "\nSuccessfully installed all the required services for CommCare HQ instance!\n" printf "Prepareing the system for first time application (code) deploy\n" commcare-cloud $env_name django-manage create_kafka_topics commcare-cloud $env_name django-manage preindex_everything