Merge pull request #405 from yanokwa/documentation-fixes

Virtualbox 6 fix
getodk · Feb 6, 2019 · 7acf3a3 · 7acf3a3
2 parents fdb6076 + 851df70
commit 7acf3a3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/docs/build-and-run-a-docker-image.md b/docs/build-and-run-a-docker-image.md
@@ -20,12 +20,12 @@ This Aggregate Docker image works by using an external running PostgreSQL 9.6 da
 - Create a database and a schema by running this SQL script:
 
   ```sql
-  CREATE USER odk WITH PASSWORD 'odk';
-  CREATE DATABASE odk WITH OWNER odk;
-  GRANT ALL PRIVILEGES ON DATABASE odk TO odk;
+  CREATE USER aggregate WITH PASSWORD 'aggregate';
+  CREATE DATABASE aggregate WITH OWNER aggregate;
+  GRANT ALL PRIVILEGES ON DATABASE aggregate TO aggregate;
   \connect odk;
   CREATE SCHEMA aggregate;
-  GRANT ALL PRIVILEGES ON SCHEMA aggregate TO odk;
+  GRANT ALL PRIVILEGES ON SCHEMA aggregate TO aggregate;
   ```
 
   **We strongly advice to use a stronger password on the first line of the script.**

diff --git a/docs/database-configurations.md b/docs/database-configurations.md
@@ -12,7 +12,7 @@ All three supported RDBs use the same configuration file structure. This is an e
 
 ```properties
 jdbc.driverClassName=org.postgresql.Driver
-jdbc.resourceName=jdbc/odk_aggregate
+jdbc.resourceName=jdbc/aggregate
 jdbc.url=jdbc:postgresql://127.0.0.1/aggregate?autoDeserialize=true
 jdbc.username=aggregate
 jdbc.password=aggregate
@@ -52,20 +52,20 @@ Run the following SQL scripts to create and prepare a database to be used by Agg
 **PostgreSQL**
 
 ```sql
-CREATE USER odk WITH PASSWORD 'odk';
-CREATE DATABASE odk WITH OWNER odk;
-GRANT ALL PRIVILEGES ON DATABASE odk TO odk;
-\connect odk;
+CREATE USER aggregate WITH PASSWORD 'aggregate';
+CREATE DATABASE aggregate WITH OWNER aggregate;
+GRANT ALL PRIVILEGES ON DATABASE aggregate TO aggregate;
+\connect aggregate;
 CREATE SCHEMA aggregate;
-GRANT ALL PRIVILEGES ON SCHEMA aggregate TO odk;
+GRANT ALL PRIVILEGES ON SCHEMA aggregate TO aggregate;
 ```
 
 **MySQL**
 
 ```sql
-CREATE DATABASE odk;
-CREATE USER odk@'%' IDENTIFIED BY 'odk';
-GRANT ALL ON odk.* TO odk@'%' IDENTIFIED BY 'odk';
+CREATE DATABASE aggregate;
+CREATE USER aggregate@'%' IDENTIFIED BY 'aggregate';
+GRANT ALL ON aggregate.* TO odk@'%' IDENTIFIED BY 'aggregate';
 FLUSH PRIVILEGES;
 ```
 
@@ -74,9 +74,9 @@ FLUSH PRIVILEGES;
 ```sql
 USE master;
 go
-CREATE DATABASE odk;
+CREATE DATABASE aggregate;
 go
-USE odk;
+USE aggregate;
 go
 CREATE SCHEMA aggregate;
 go

diff --git a/gradle.properties.example b/gradle.properties.example
@@ -1,4 +1,4 @@
 #Uncomment the line that corresponds to your computer's operating system
-#packerZip=https://releases.hashicorp.com/packer/1.2.1/packer_1.2.1_linux_amd64.zip
-#packerZip=https://releases.hashicorp.com/packer/1.2.1/packer_1.2.1_windows_amd64.zip
-#packerZip=https://releases.hashicorp.com/packer/1.2.1/packer_1.2.1_darwin_amd64.zip
+#packerZip=https://releases.hashicorp.com/packer/1.3.4/packer_1.3.4_linux_amd64.zip
+#packerZip=https://releases.hashicorp.com/packer/1.3.4/packer_1.3.4_windows_amd64.zip
+#packerZip=https://releases.hashicorp.com/packer/1.3.4/packer_1.3.4_darwin_amd64.zip
diff --git a/src/main/resources/jdbc.properties.example b/src/main/resources/jdbc.properties.example
@@ -1,5 +1,5 @@
 jdbc.driverClassName=org.postgresql.Driver
-jdbc.resourceName=jdbc/odk_aggregate
+jdbc.resourceName=jdbc/aggregate
 jdbc.url=jdbc:postgresql://127.0.0.1/aggregate?autoDeserialize=true
 jdbc.username=aggregate
 jdbc.password=aggregate