From a5671686ac42268ae230cc34a8a40a79ff1ad8f1 Mon Sep 17 00:00:00 2001
From: Jan Mach <jan.mach@cesnet.cz>
Date: Sun, 17 Oct 2021 15:55:21 +0200
Subject: [PATCH] Minor documentation and provisioning improvements.
(Redmine issue: #7041)
---
doc/sphinx/_doclib/development.rst | 8 ++++++++
vagrantenv/provision.sh | 23 ++++++++---------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/doc/sphinx/_doclib/development.rst b/doc/sphinx/_doclib/development.rst
index 32bd3fdb1..c6e40d8a3 100644
--- a/doc/sphinx/_doclib/development.rst
+++ b/doc/sphinx/_doclib/development.rst
@@ -666,6 +666,14 @@ Keep in mind following:
At this point you are all set to develop Mentat locally without cluttering your personal
workstation.
+To refresh the development box use following Vagrant commands:
+
+.. code-block:: shell
+
+ vagrant destroy
+ vagrant box update
+ vagrant up
+
Examples
--------------------------------------------------------------------------------
diff --git a/vagrantenv/provision.sh b/vagrantenv/provision.sh
index 1a9fc6544..22e977519 100644
--- a/vagrantenv/provision.sh
+++ b/vagrantenv/provision.sh
@@ -153,21 +153,14 @@ echo "==========> Bootstraping runtime environment"
/etc/mentat/scripts/init-runenv.sh
echo "==========> Tweaking database users"
-sudo -u postgres psql -c "SELECT usename FROM pg_catalog.pg_user;" | grep root > /dev/null
-if [ $? -ne 0 ]; then
- echo "Creating default PostgreSQL user 'root'"
- sudo -u postgres psql -c "CREATE USER root WITH SUPERUSER CREATEDB ENCRYPTED PASSWORD 'root';"
-fi
-sudo -u postgres psql -c "SELECT usename FROM pg_catalog.pg_user;" | grep mentat > /dev/null
-if [ $? -ne 0 ]; then
- echo "Creating default PostgreSQL user 'mentat'"
- sudo -u postgres psql -c "CREATE USER mentat WITH SUPERUSER CREATEDB ENCRYPTED PASSWORD 'mentat';"
-fi
-sudo -u postgres psql -c "SELECT usename FROM pg_catalog.pg_user;" | grep vagrant > /dev/null
-if [ $? -ne 0 ]; then
- echo "Creating default PostgreSQL user 'vagrant'"
- sudo -u postgres psql -c "CREATE USER vagrant WITH SUPERUSER CREATEDB ENCRYPTED PASSWORD 'vagrant';"
-fi
+for dbuname in root mentat vagrant watchdog
+do
+ sudo -u postgres psql -c "SELECT usename FROM pg_catalog.pg_user;" | grep $dbuname > /dev/null
+ if [ $? -ne 0 ]; then
+ echo "Creating default PostgreSQL user '$dbuname'"
+ sudo -u postgres psql -c "CREATE USER $dbuname WITH SUPERUSER CREATEDB ENCRYPTED PASSWORD '$dbuname';"
+ fi
+done
#sudo -u mentat ${MENTAT_VENV}/bin/python /vagrant/bin/mentat-dbmngr.py --command user-add login=admin "fullname=Developer Admin" email=root "organization=CESNET, z.s.p.o." roles=user,admin
echo "==========> Bootstraping database schema and configuration"
--
GitLab