diff --git a/CouchDB/aurin-data.josn b/CouchDB/aurin-data.josn
new file mode 100644
index 0000000000000000000000000000000000000000..0da548237bb231f06a798ee38e5b0c1e09c7aec4
--- /dev/null
+++ b/CouchDB/aurin-data.josn
@@ -0,0 +1,163 @@
+{"docs":[
+ {
+ "state": "NSW",
+ "net_migration": 89813,
+ "pop_density": 1196.031871,
+ "total_resident": 7988241,
+ "rent_avg": 579.3885664,
+ "sold_avg": 1007725.07,
+ "sale_avg": 1074029.68,
+ "employ_growth_total": 12.50232738,
+ "employ_growth_edu": 1.43920823,
+ "employ_growth_healthcare": 3.0597856,
+ "employ_growth_real_est": 11.33713195,
+ "employ_growth_info_media": 7.454174063,
+ "employ_growth_accom": 8.13065175,
+ "total_covid19_case": 3053,
+ "positive_count": 1550803,
+ "negative_count": 799971,
+ "neutral_count": 1920591,
+ "total_count": 4271365,
+ "positive_per": 0.3631,
+ "negative_per": 0.1873,
+ "neutral_per": 0.4496
+ },
+ {
+ "state": "NT",
+ "net_migration": 846,
+ "pop_density": 23.55,
+ "total_resident": 247327,
+ "rent_avg": 494.41595,
+ "sold_avg": 475642.3,
+ "sale_avg": 508069.7,
+ "employ_growth_total": 3.820865,
+ "employ_growth_edu": 0.599048,
+ "employ_growth_healthcare": 0.997259,
+ "employ_growth_real_est": 8.07227,
+ "employ_growth_info_media": 0.10745,
+ "employ_growth_accom": 12.34999,
+ "total_covid19_case": 29,
+ "positive_count": 36944,
+ "negative_count": 18127,
+ "neutral_count": 51024,
+ "total_count": 106095,
+ "positive_per": 0.3482,
+ "negative_per": 0.1709,
+ "neutral_per": 0.4809
+ },
+ {
+ "state": "QLD",
+ "net_migration": 28668,
+ "pop_density": 418.1227778,
+ "total_resident": 5011216,
+ "rent_avg": 428.6937278,
+ "sold_avg": 564424.729,
+ "sale_avg": 566933.33,
+ "employ_growth_total": 9.120392182,
+ "employ_growth_edu": 1.08818613,
+ "employ_growth_healthcare": 2.48138783,
+ "employ_growth_real_est": 1.321144756,
+ "employ_growth_info_media": 3.285635364,
+ "employ_growth_accom": 14.16161625,
+ "total_covid19_case": 1045,
+ "positive_count": 262065,
+ "negative_count": 117646,
+ "neutral_count": 332506,
+ "total_count": 712217,
+ "positive_per": 0.368,
+ "negative_per": 0.1652,
+ "neutral_per": 0.4669
+ },
+ {
+ "state": "SA",
+ "net_migration": 12675,
+ "pop_density": 354.79,
+ "total_resident": 1736422,
+ "rent_avg": 383.032145,
+ "sold_avg": 495889.08,
+ "sale_avg": 474045.165,
+ "employ_growth_total": 6.1158575,
+ "employ_growth_edu": 0.9776356,
+ "employ_growth_healthcare": 2.3699834,
+ "employ_growth_real_est": 8.906807,
+ "employ_growth_info_media": -2.037977425,
+ "employ_growth_accom": 2.1598225,
+ "total_covid19_case": 439,
+ "positive_count": 163362,
+ "negative_count": 86337,
+ "neutral_count": 222593,
+ "total_count": 472292,
+ "positive_per": 0.3459,
+ "negative_per": 0.1828,
+ "neutral_per": 0.4713
+ },
+ {
+ "state": "TAS",
+ "net_migration": 2579,
+ "pop_density": 37.775,
+ "total_resident": 528201,
+ "rent_avg": 343.7124,
+ "sold_avg": 370877.6667,
+ "sale_avg": 400362.367,
+ "employ_growth_total": 3.398791,
+ "employ_growth_edu": 0.35486253,
+ "employ_growth_healthcare": 1.31546425,
+ "employ_growth_real_est": 3.2555975,
+ "employ_growth_info_media": 0.32914925,
+ "employ_growth_accom": 8.0294875,
+ "total_covid19_case": 227,
+ "positive_count": 102606,
+ "negative_count": 54837,
+ "neutral_count": 118245,
+ "total_count": 275688,
+ "positive_per": 0.3722,
+ "negative_per": 0.1989,
+ "neutral_per": 0.4289
+ },
+ {
+ "state": "VIC",
+ "net_migration": 85053,
+ "pop_density": 702.0864286,
+ "total_resident": 6460675,
+ "rent_avg": 433.6862714,
+ "sold_avg": 722854.5086,
+ "sale_avg": 720710.853,
+ "employ_growth_total": 16.23318914,
+ "employ_growth_edu": 2.08062824,
+ "employ_growth_healthcare": 4.263750671,
+ "employ_growth_real_est": 11.73228657,
+ "employ_growth_info_media": -2.487303796,
+ "employ_growth_accom": 12.957402,
+ "total_covid19_case": 1496,
+ "positive_count": 591339,
+ "negative_count": 301038,
+ "neutral_count": 922736,
+ "total_count": 1815113,
+ "positive_per": 0.3258,
+ "negative_per": 0.1659,
+ "neutral_per": 0.5084
+ },
+ {
+ "state": "WA",
+ "net_migration": 12809,
+ "pop_density": 380.42,
+ "total_resident": 2595192,
+ "rent_avg": 400.79881,
+ "sold_avg": 526338.95,
+ "sale_avg": 529134.65,
+ "employ_growth_total": 11.1051625,
+ "employ_growth_edu": 1.09021282,
+ "employ_growth_healthcare": 2.45541905,
+ "employ_growth_real_est": 2.9558144,
+ "employ_growth_info_media": 4.6120237,
+ "employ_growth_accom": 13.9669925,
+ "total_covid19_case": 552,
+ "positive_count": 420302,
+ "negative_count": 208816,
+ "neutral_count": 504838,
+ "total_count": 1133956,
+ "positive_per": 0.3707,
+ "negative_per": 0.1841,
+ "neutral_per": 0.4452
+ }
+]}
\ No newline at end of file
diff --git a/CouchDB/aurin-data.json b/CouchDB/aurin-data.json
new file mode 100644
index 0000000000000000000000000000000000000000..6e9b520549c109db815af4122a9bd2efaf28982c
--- /dev/null
+++ b/CouchDB/aurin-data.json
@@ -0,0 +1,163 @@
+{"docs":[
+ {
+ "state": "NSW",
+ "net_migration": 89813,
+ "pop_density": 1196.031871,
+ "total_resident": 7988241,
+ "rent_avg": 579.3885664,
+ "sold_avg": 1007725.07,
+ "sale_avg": 1074029.68,
+ "employ_growth_total": 12.50232738,
+ "employ_growth_edu": 1.43920823,
+ "employ_growth_healthcare": 3.0597856,
+ "employ_growth_real_est": 11.33713195,
+ "employ_growth_info_media": 7.454174063,
+ "employ_growth_accom": 8.13065175,
+ "total_covid19_case": 3053,
+ "positive_count": 1550803,
+ "negative_count": 799971,
+ "neutral_count": 1920591,
+ "total_count": 4271365,
+ "positive_per": 0.3631,
+ "negative_per": 0.1873,
+ "neutral_per": 0.4496
+ },
+ {
+ "state": "NT",
+ "net_migration": 846,
+ "pop_density": 23.55,
+ "total_resident": 247327,
+ "rent_avg": 494.41595,
+ "sold_avg": 475642.3,
+ "sale_avg": 508069.7,
+ "employ_growth_total": 3.820865,
+ "employ_growth_edu": 0.599048,
+ "employ_growth_healthcare": 0.997259,
+ "employ_growth_real_est": 8.07227,
+ "employ_growth_info_media": 0.10745,
+ "employ_growth_accom": 12.34999,
+ "total_covid19_case": 29,
+ "positive_count": 36944,
+ "negative_count": 18127,
+ "neutral_count": 51024,
+ "total_count": 106095,
+ "positive_per": 0.3482,
+ "negative_per": 0.1709,
+ "neutral_per": 0.4809
+ },
+ {
+ "state": "QLD",
+ "net_migration": 28668,
+ "pop_density": 418.1227778,
+ "total_resident": 5011216,
+ "rent_avg": 428.6937278,
+ "sold_avg": 564424.729,
+ "sale_avg": 566933.33,
+ "employ_growth_total": 9.120392182,
+ "employ_growth_edu": 1.08818613,
+ "employ_growth_healthcare": 2.48138783,
+ "employ_growth_real_est": 1.321144756,
+ "employ_growth_info_media": 3.285635364,
+ "employ_growth_accom": 14.16161625,
+ "total_covid19_case": 1045,
+ "positive_count": 262065,
+ "negative_count": 117646,
+ "neutral_count": 332506,
+ "total_count": 712217,
+ "positive_per": 0.368,
+ "negative_per": 0.1652,
+ "neutral_per": 0.4669
+ },
+ {
+ "state": "SA",
+ "net_migration": 12675,
+ "pop_density": 354.79,
+ "total_resident": 1736422,
+ "rent_avg": 383.032145,
+ "sold_avg": 495889.08,
+ "sale_avg": 474045.165,
+ "employ_growth_total": 6.1158575,
+ "employ_growth_edu": 0.9776356,
+ "employ_growth_healthcare": 2.3699834,
+ "employ_growth_real_est": 8.906807,
+ "employ_growth_info_media": -2.037977425,
+ "employ_growth_accom": 2.1598225,
+ "total_covid19_case": 439,
+ "positive_count": 163362,
+ "negative_count": 86337,
+ "neutral_count": 222593,
+ "total_count": 472292,
+ "positive_per": 0.3459,
+ "negative_per": 0.1828,
+ "neutral_per": 0.4713
+ },
+ {
+ "state": "TAS",
+ "net_migration": 2579,
+ "pop_density": 37.775,
+ "total_resident": 528201,
+ "rent_avg": 343.7124,
+ "sold_avg": 370877.6667,
+ "sale_avg": 400362.367,
+ "employ_growth_total": 3.398791,
+ "employ_growth_edu": 0.35486253,
+ "employ_growth_healthcare": 1.31546425,
+ "employ_growth_real_est": 3.2555975,
+ "employ_growth_info_media": 0.32914925,
+ "employ_growth_accom": 8.0294875,
+ "total_covid19_case": 227,
+ "positive_count": 102606,
+ "negative_count": 54837,
+ "neutral_count": 118245,
+ "total_count": 275688,
+ "positive_per": 0.3722,
+ "negative_per": 0.1989,
+ "neutral_per": 0.4289
+ },
+ {
+ "state": "VIC",
+ "net_migration": 85053,
+ "pop_density": 702.0864286,
+ "total_resident": 6460675,
+ "rent_avg": 433.6862714,
+ "sold_avg": 722854.5086,
+ "sale_avg": 720710.853,
+ "employ_growth_total": 16.23318914,
+ "employ_growth_edu": 2.08062824,
+ "employ_growth_healthcare": 4.263750671,
+ "employ_growth_real_est": 11.73228657,
+ "employ_growth_info_media": -2.487303796,
+ "employ_growth_accom": 12.957402,
+ "total_covid19_case": 1496,
+ "positive_count": 591339,
+ "negative_count": 301038,
+ "neutral_count": 922736,
+ "total_count": 1815113,
+ "positive_per": 0.3258,
+ "negative_per": 0.1659,
+ "neutral_per": 0.5084
+ },
+ {
+ "state": "WA",
+ "net_migration": 12809,
+ "pop_density": 380.42,
+ "total_resident": 2595192,
+ "rent_avg": 400.79881,
+ "sold_avg": 526338.95,
+ "sale_avg": 529134.65,
+ "employ_growth_total": 11.1051625,
+ "employ_growth_edu": 1.09021282,
+ "employ_growth_healthcare": 2.45541905,
+ "employ_growth_real_est": 2.9558144,
+ "employ_growth_info_media": 4.6120237,
+ "employ_growth_accom": 13.9669925,
+ "total_covid19_case": 552,
+ "positive_count": 420302,
+ "negative_count": 208816,
+ "neutral_count": 504838,
+ "total_count": 1133956,
+ "positive_per": 0.3707,
+ "negative_per": 0.1841,
+ "neutral_per": 0.4452
+ }
+]}
\ No newline at end of file
diff --git a/CouchDB/upload.sh b/CouchDB/upload.sh
index a647e3c874af322347711dbddaf42b9c795b0494..28c16bbb8d76ffd1a85401ac831c375d38814de0 100755
--- a/CouchDB/upload.sh
+++ b/CouchDB/upload.sh
@@ -9,10 +9,10 @@ export declare -a othernodes=`echo ${nodes[@]} | sed s/${masternode}//`
export size=${#nodes[@]}
# curl -XPUT "http://${user}:${pass}@${masternode}:5984/twitter"
-curl -XPUT "http://${user}:${pass}@${masternode}:5984/property-data"
+curl -XPUT "http://${user}:${pass}@${masternode}:5984/aurin-data"
# curl -XPOST "http://${user}:${pass}@${masternode}:5984/twitter/_bulk_docs " --header "Content-Type: application/json" \
# --data @../twitter/data.json
-curl -XPOST "http://${user}:${pass}@${masternode}:5984/property-data/_bulk_docs " --header "Content-Type: application/json" \
- --data @property-data.json
+curl -XPOST "http://${user}:${pass}@${masternode}:5984/aurin-data/_bulk_docs " --header "Content-Type: application/json" \
+ --data @aurin-data.json
diff --git a/ansible/roles/cluster-build/tasks/main.yaml b/ansible/roles/cluster-build/tasks/main.yaml
index 3a8e66f6f54280957de181f91a61aa0cb3e4291e..1e85bdf5adeec3c15bba4fd530a992387b8ed466 100644
--- a/ansible/roles/cluster-build/tasks/main.yaml
+++ b/ansible/roles/cluster-build/tasks/main.yaml
@@ -1,31 +1,37 @@
---
-- name: Install dep
- tags: 'dep'
- become: yes
- pip:
- name: ['node','npm','grunt','jq']
- state: latest
+# - name: Install dep
+# tags: 'dep'
+# become: yes
+# pip:
+# name: ['node','npm','grunt','jq']
+# state: latest
-- name: Copy package-lock
- become: yes
- template:
- src: package-lock.json
- dest: package-lock.json
- owner: "{{ ansible_user }}"
- group: "{{ ansible_user }}"
+# - name: Copy package-lock
+# become: yes
+# template:
+# src: package-lock.json
+# dest: package-lock.json
+# owner: "{{ ansible_user }}"
+# group: "{{ ansible_user }}"
-- name: Copy package.json
- become: yes
- template:
- src: package.json
- dest: package.json
- owner: "{{ ansible_user }}"
- group: "{{ ansible_user }}"
+# - name: Copy package.json
+# become: yes
+# template:
+# src: package.json
+# dest: package.json
+# owner: "{{ ansible_user }}"
+# group: "{{ ansible_user }}"
-- name: NPM
- become: yes
- script: ./templates/install.sh
- register: build
+# - name: NPM
+# become: yes
+# script: ./templates/install.sh
+# register: build
+
+- name: Create a directory if it does not exist
+ file:
+ path: /home/ubuntu/etc
+ state: directory
+ mode: '0755'
- name: Copy local.ini
become: yes
@@ -37,28 +43,8 @@
# - debug: var=build.stdout_lines
-# - debug: var=ansible_default_ipv4.address
-
-# - name: Remove a container
-# become: yes
-# docker_container:
-# name: couchdb${node}
-# state: absent
-# force_kill: yes
-
- name: Build CouchDB
script: ./templates/run.sh '{{ ansible_default_ipv4.address }}'
register: out
-# - debug: var=out.stdout_lines
-
-# - name: Reboot machine
-# become: yes
-# reboot:
-# reboot_timeout: 3000MGVjNGJjYTU2ZmZmZGQx
-
-# - name: Reboot CouchDB
-# script: ./templates/reboot.sh '{{ ansible_default_ipv4.address }}'
-# register: reboot
-
-# - debug: var=reboot.stdout_lines
\ No newline at end of file
+- debug: var=out.stdout_lines
diff --git a/ansible/roles/cluster-build/templates/local.ini b/ansible/roles/cluster-build/templates/local.ini
index fd0c77ea4f71d2666949204a6539b17cd552cc2d..372e824014720a91a2137548d8474efc5377584a 100644
--- a/ansible/roles/cluster-build/templates/local.ini
+++ b/ansible/roles/cluster-build/templates/local.ini
@@ -1,8 +1,8 @@
[cors]
-credentials: true
-headers: accept, authorization, content-type, origin, referer, cache-control, x-requested-with
-methods: GET,PUT,POST,HEAD,DELETE
-origins: *
+credentials = false
+methods = GET,HEAD,PUT,POST
+; headers = accept, authorization, content-type, origin, referer, x-csrf-token
+origins = *
[httpd]
enable_cors = true
\ No newline at end of file
diff --git a/ansible/roles/cluster-build/templates/run.sh b/ansible/roles/cluster-build/templates/run.sh
index 9d3317479a50dc6213db294a79a78447f32cebf3..30f466de111429a47a5d6a3c2326eb1c1b501be5 100644
--- a/ansible/roles/cluster-build/templates/run.sh
+++ b/ansible/roles/cluster-build/templates/run.sh
@@ -12,12 +12,12 @@ export flag="-setcookie \"${cookie}\" -name \"couchdb@${node}\""
if [ ! -z $(sudo docker ps -a -q) ]
then
- sudo docker rm -f $(sudo docker ps -a -q) #REMOVE ALL - DELETE
+ sudo docker rm -f $(sudo docker ps -a -q)
fi
if [ ! -z $(sudo docker network ls) ]
then
- sudo docker network rm -f $(sudo docker network ls) #REMOVE ALL - DELETE
+ sudo docker network rm -f $(sudo docker network ls)
fi
echo "== Pull image =="
@@ -40,6 +40,7 @@ sudo docker create\
--env COUCHDB_PASSWORD=${pass}\
--env NODENAME=couchdb@${node}\
--env COUCHDB_SECRET=${cookie}\
+ --env ENABLE_CORS=true\
--env ERL_FLAGS="-setcookie \"${cookie}\" -name \"couchdb@${node}\""\
ibmcom/couchdb3:${VERSION}
@@ -51,25 +52,22 @@ sudo docker start couchdb${node}
echo "== Change vm.args =="
sudo docker cp local.ini couchdb${node}:/local.ini
+
# for cont in "${conts[@]}"; do sudo docker cp edit-vm.sh couchdb:/edit-vm.sh; done
# for cont in "${conts[@]}"; do sudo docker exec -u root -it ${cont} chmod u+x edit-vm.sh; done
-echo "cd /opt/couchdb/etc/;echo ${NOOENAME} >> vm.args"
-sudo docker exec -u root -it couchdb${node} /bin/sh -c "export node=${node}; cd /opt/couchdb/etc/;echo -name couchdb@${node} >> vm.args;exit"
-sudo docker exec -u root -it couchdb${node} /bin/sh -c "export cookie=${cookie};cd /opt/couchdb/etc/;echo -setcookie ${cookie} >> vm.args;exit"
-# sudo docker exec -u root -it couchdb${node} /bin/sh -c "export flag=${flag};cd /opt/couchdb/etc/;echo ${flag} >> vm.args;exit"
-sudo docker exec -u root -it couchdb${node} /bin/sh -c "cd /opt/couchdb/etc/;sed -it 's/max 9100/max 9200/g' vm.args;exit"
-# for cont in "${conts[@]}"; do sudo docker exec -u root -it ${cont} bash edit-vm.sh; done
+# echo "cd /opt/couchdb/etc/;echo ${NOOENAME} >> vm.args"
+# sudo docker exec -u root -it couchdb${node} /bin/sh -c "export node=${node}; cd /opt/couchdb/etc/;echo -name couchdb@${node} >> vm.args;exit"
+# sudo docker exec -u root -it couchdb${node} /bin/sh -c "export cookie=${cookie};cd /opt/couchdb/etc/;echo -setcookie ${cookie} >> vm.args;exit"
+# # sudo docker exec -u root -it couchdb${node} /bin/sh -c "export flag=${flag};cd /opt/couchdb/etc/;echo ${flag} >> vm.args;exit"
+# sudo docker exec -u root -it couchdb${node} /bin/sh -c "cd /opt/couchdb/etc/;sed -it 's/max 9100/max 9200/g' vm.args;exit"
+# # for cont in "${conts[@]}"; do sudo docker exec -u root -it ${cont} bash edit-vm.sh; done
#sudo docker exec -it couchdb bash
# sudo docker exec -u root -it couchdb${node} /bin/sh -c "cd /opt/couchdb/etc/;cat /dev/null > local.ini"
-sudo docker exec -u root -it couchdb${node} /bin/sh -c "cd /opt/couchdb/etc/;rm -rf local.ini"
-sudo docker exec -u root -it couchdb${node} /bin/sh -c "mv local.ini /opt/couchdb/etc/;exit"
+# sudo docker exec -u root -it couchdb${node} /bin/sh -c "cd /opt/couchdb/etc/;rm -rf local.ini"
+sudo docker exec -u root -it couchdb${node} /bin/sh -c "mv local.ini /opt/couchdb/etc/local.d;exit"
+# sudo dockerd --api-enable-cors --api-cors-header=http://172.26.131:3001
# sudo docker exec -u root -it couchdb${node} /bin/sh -c "cd /opt/couchdb/etc/;/init.d/couchdb restart"
-
# curl -X POST http://admin:admin@172.26.133.58:5984/_restart -H "Content-Type: application/json"
-#TESTS
-# erl -name couchdb@172.26.132.234 -setcookie 'brumbrum' -kernel inet_dist_listen_min 9100 -kernel inet_dist_listen_max 9100
-# erl -name couchdb@172.26.133.31 -setcookie 'brumbrum' -kernel inet_dist_listen_min 9100 -kernel inet_dist_listen_max 9100
-# net_kernel:connect_node(couchdb@172.26.133.27).
-
+sudo docker restart couchdb${node}
\ No newline at end of file