Skip to content

Commit

Permalink
Upgrade Neo4j to 3.2.3-enterprise
Browse files Browse the repository at this point in the history
neo4j-guide-extension-3.2.3.jar was built using `mvn clean install` from
dhimmel/neo4j-guides@fa0cb4c

Required neo4j-guides tweak. See
neo4j-contrib/neo4j-guides#14
neo4j-contrib/neo4j-guides#15

Explicitly install curl, which appears to not be included by default
anymore.
  • Loading branch information
dhimmel committed Sep 18, 2017
1 parent f6e6751 commit 4dfa938
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 30 deletions.
7 changes: 4 additions & 3 deletions hetnet/neo4j/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
FROM neo4j:3.1.4
FROM neo4j:3.2.3-enterprise
MAINTAINER Daniel Himmelstein, <[email protected]>

COPY scripts /
RUN chmod +x /get_data_run_neo4j.sh

COPY files/neo4j.conf /var/lib/neo4j/conf/
COPY files/piwik.html /
COPY files/neo4j-guide-extension-3.0.1.jar /var/lib/neo4j/plugins
COPY files/neo4j-guide-extension-3.2.3.jar /var/lib/neo4j/plugins
COPY guides /guides

# Update or install packages
RUN apk add --no-cache --quiet \
bzip2 \
curl \
tar \
zip

Expand All @@ -24,7 +25,7 @@ RUN cd /var/lib/neo4j/lib && \
JAR_PATH=`ls neo4j-browser-*` && \
HTML_PATH=browser/index.html && \
unzip $JAR_PATH $HTML_PATH && \
OLD='<title ng-bind-template="Neo4j {{titlebarString}}">Neo4j</title>' && \
OLD='<title>Neo4j Browser</title>' && \
NEW='<title>Hetionet · Neo4j Browser</title>' && \
sed --in-place "s|$OLD|$NEW|" $HTML_PATH && \
OLD='<meta name="description" content="Neo4j Browser">' && \
Expand Down
3 changes: 2 additions & 1 deletion hetnet/neo4j/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The contents of this repository are mostly included in the Docker image. However
Build the image using the following command:

```sh
TAG="dhimmel/hetionet:hetionet-v1.0_neo4j-3.1.4"
TAG="dhimmel/hetionet:hetionet-v1.0_neo4j-3.2.3"
docker build --tag dhimmel/hetionet:latest --tag $TAG --file Dockerfile .
```

Expand All @@ -24,6 +24,7 @@ To run the image on a local system, (development or local usage) run the followi
```sh
docker run \
--name=hetionet-container \
--rm \
--publish=7474:7474 \
--publish=7687:7687 \
--volume=$HOME/neo4j/hetionet-data:/data \
Expand Down
Binary file not shown.
Binary file not shown.
130 changes: 104 additions & 26 deletions hetnet/neo4j/docker/files/neo4j.conf
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
#*****************************************************************
# Neo4j configuration
#
# For more details and a complete list of settings, please see
# https://neo4j.com/docs/operations-manual/current/reference/configuration-settings/
#*****************************************************************

# The name of the database to mount
dbms.active_database=graph.db

# Paths of directories in the installation.

# This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or uncomment it to
# allow files to be loaded from anywhere in filesystem; this introduces possible security problems. See the `LOAD CSV`
# section of the manual for details.
# This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or comment it out to
# allow files to be loaded from anywhere in the filesystem; this introduces possible security problems. See the
# `LOAD CSV` section of the manual for details.
dbms.directories.import=import

# Whether requests to Neo4j are authenticated.
Expand All @@ -19,31 +20,114 @@ dbms.security.auth_enabled=false
# Enable this to be able to upgrade a store from an older version.
dbms.allow_format_migration=true


#*****************************************************************
# Network connector configuration
#*****************************************************************

# With default configuration Neo4j only accepts local connections.
# To accept non-local connections, uncomment this line:
dbms.connectors.default_listen_address=0.0.0.0

# You can also choose a specific network interface, and configure a non-default
# port for each connector, by setting their individual listen_address.

# The address at which this server can be reached by its clients. This may be the server's IP address or DNS name, or
# it may be the address of a reverse proxy which sits in front of the server. This setting may be overridden for
# individual connectors below.
#dbms.connectors.default_advertised_address=localhost

# You can also choose a specific advertised hostname or IP address, and
# configure an advertised port for each connector, by setting their
# individual advertised_address.

# Bolt connector
dbms.connector.bolt.type=BOLT
dbms.connector.bolt.enabled=true
dbms.connector.bolt.tls_level=OPTIONAL
# To have Bolt accept non-local connections, uncomment this line
dbms.connector.bolt.address=0.0.0.0:7687
#dbms.connector.bolt.tls_level=OPTIONAL
#dbms.connector.bolt.listen_address=:7687

# HTTP Connector
dbms.connector.http.type=HTTP
# HTTP Connector. There must be exactly one HTTP connector.
dbms.connector.http.enabled=true
#dbms.connector.http.encryption=NONE
# To have HTTP accept non-local connections, uncomment this line
dbms.connector.http.address=0.0.0.0:7474
#dbms.connector.http.listen_address=:7474

# HTTPS Connector
dbms.connector.https.type=HTTP
# HTTPS Connector. There can be zero or one HTTPS connectors.
dbms.connector.https.enabled=true
dbms.connector.https.encryption=TLS
dbms.connector.https.address=localhost:7473
#dbms.connector.https.listen_address=:7473

# Number of Neo4j worker threads.
#dbms.threads.worker_count=

#*****************************************************************
# Logging configuration
#*****************************************************************

# To enable HTTP logging, uncomment this line
dbms.logs.http.enabled=true

# Number of HTTP logs to keep.
#dbms.logs.http.rotation.keep_number=5

# Size of each HTTP log that is kept.
#dbms.logs.http.rotation.size=20m

# To enable GC Logging, uncomment this line
#dbms.logs.gc.enabled=true

# GC Logging Options
# see https://docs.oracle.com/cd/E19957-01/819-0084-10/pt_tuningjava.html#wp57013 for more information.
#dbms.logs.gc.options=-XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintPromotionFailure -XX:+PrintTenuringDistribution

# Number of GC logs to keep.
#dbms.logs.gc.rotation.keep_number=5

# Size of each GC log that is kept.
#dbms.logs.gc.rotation.size=20m

# Size threshold for rotation of the debug log. If set to zero then no rotation will occur. Accepts a binary suffix "k",
# "m" or "g".
#dbms.logs.debug.rotation.size=20m

# Maximum number of history files for the internal log.
#dbms.logs.debug.rotation.keep_number=7

# Log executed queries that takes longer than the configured threshold. Enable by uncommenting this line.
dbms.logs.query.enabled=true

# If the execution of query takes more time than this threshold, the query is logged. If set to zero then all queries
# are logged.
dbms.logs.query.threshold=0

# The file size in bytes at which the query log will auto-rotate. If set to zero then no rotation will occur. Accepts a
# binary suffix "k", "m" or "g".
#dbms.logs.query.rotation.size=20m

# Maximum number of history files for the query log.
#dbms.logs.query.rotation.keep_number=7

# Include parameters for the executed queries being logged (this is enabled by default).
dbms.logs.query.parameter_logging_enabled=true

# Uncomment this line to include detailed time information for the executed queries being logged:
dbms.logs.query.time_logging_enabled=true

# Uncomment this line to include bytes allocated by the executed queries being logged:
dbms.logs.query.allocation_logging_enabled=true

# Uncomment this line to include page hits and page faults information for the executed queries being logged:
dbms.logs.query.page_logging_enabled=true

# The security log is always enabled when `dbms.security.auth_enabled=true`, and resides in `logs/security.log`.

# Log level for the security log. One of DEBUG, INFO, WARN and ERROR.
#dbms.logs.security.level=INFO

# Threshold for rotation of the security log.
#dbms.logs.security.rotation.size=20m

# Minimum time interval after last rotation of the security log before it may be rotated again.
#dbms.logs.security.rotation.delay=300s

# Maximum number of history files for the security log.
#dbms.logs.security.rotation.keep_number=7

#*****************************************************************
# Miscellaneous configuration
Expand All @@ -57,19 +141,13 @@ dbms.read_only=true
dbms.transaction.timeout=120s

# Enable remote content (guides) from anywhere
# In Neo4j 3.2.1, only available in enterprise
browser.remote_content_hostname_whitelist=*

# Configure the guide-extension
# https://github.com/jexp/neo4j-guides/tree/master/guide-extension
dbms.unmanaged_extension_classes=extension.web=/guides
org.neo4j.server.guide.directory=data/guides

# Enable query logging (enterprise only so currently inactive)
dbms.logs.query.enabled=true
dbms.logs.query.parameter_logging_enabled=true
dbms.logs.query.rotation.keep_number=10
dbms.logs.query.rotation.size=1M
dbms.logs.query.threshold=0

# Autoplay the Hetionet guide
browser.post_connect_cmd=play https://neo4j.het.io/guides/hetionet.html

0 comments on commit 4dfa938

Please sign in to comment.