Merge pull request #3325 from edx/derf/neo4j_3_fixes

neo4j_3_fixes

playbooks/roles/neo4j/defaults/main.yml

@@ -21,11 +21,11 @@ NEO4J_SERVER_NAME: "localhost"
 neo4j_gpg_key_url: https://debian.neo4j.org/neotechnology.gpg.key
 neo4j_apt_repository: "deb http://debian.neo4j.org/repo stable/"
 neo4j_version: "3.0.3"
-neo4j_server_config_file: "/etc/neo4j/neo4j-server.properties"
+neo4j_server_config_file: "/etc/neo4j/neo4j.conf"
 neo4j_https_port: 7473  # default in package is 7473
 neo4j_http_port: 7474  # default in package is 7474
+neo4j_listen_address: "0.0.0.0"
 
 # Properties file settings
-neo4j_address_settings_key: "org.neo4j.server.webserver.address"
-neo4j_https_settings_key: "org.neo4j.server.webserver.https.port"
-neo4j_http_settings_key: "org.neo4j.server.webserver.port"
+neo4j_https_settings_key: "dbms.connector.https.address"
+neo4j_http_settings_key: "dbms.connector.http.address"

playbooks/roles/neo4j/tasks/main.yml

@@ -45,21 +45,11 @@
     - install
     - install:base
 
-- name: set to listen on all IPs
-  lineinfile:
-    dest: "{{ neo4j_server_config_file }}"
-    regexp: "{{ neo4j_address_settings_key }}="
-    line: "{{ neo4j_address_settings_key }}=0.0.0.0"
-    state: present
-  tags:
-    - install
-    - install:configuration
-
 - name: set to listen on specific port for https
   lineinfile:
     dest: "{{ neo4j_server_config_file }}"
     regexp: "{{ neo4j_https_settings_key }}="
-    line: "{{ neo4j_https_settings_key }}={{ neo4j_https_port }}"
+    line: "{{ neo4j_https_settings_key }}={{ neo4j_listen_address }}:{{ neo4j_https_port }}"
   tags:
     - install
     - install:configuration
@@ -68,14 +58,14 @@
   lineinfile:
     dest: "{{ neo4j_server_config_file }}"
     regexp: "{{ neo4j_http_settings_key }}="
-    line: "{{ neo4j_http_settings_key }}={{ neo4j_http_port }}"
+    line: "{{ neo4j_http_settings_key }}={{ neo4j_listen_address }}:{{ neo4j_http_port }}"
   tags:
     - install
     - install:configuration
 
 - name: restart neo4j
   service: 
-    name: neo4j-service 
+    name: neo4j 
     state: restarted
   tags:
     - manage