Skip to content

Merging the system config into the end-user dataset #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
namedgraph wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Merging the system config into the end-user dataset #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ ENV SIGN_UP_CERT_VALIDITY=

ENV LOAD_DATASETS=

ENV CONTEXT_DATASET_URL=file:///var/linkeddatahub/datasets/system.trig
ENV CONTEXT_ENDPOINT_URL=

ENV ADMIN_DATASET_URL=file:///var/linkeddatahub/datasets/admin.trig

Expand Down Expand Up @@ -161,12 +161,6 @@ COPY platform/root-owner-authorization.trig.template root-owner-authorization.tr

COPY platform/namespace-ontology.trig.template namespace-ontology.trig.template

# copy default datasets

COPY platform/datasets/admin.trig /var/linkeddatahub/datasets/admin.trig

COPY platform/datasets/end-user.trig /var/linkeddatahub/datasets/end-user.trig

# copy sitemap query & stylesheet

COPY platform/sitemap/sitemap.rq.template /var/linkeddatahub/sitemap/sitemap.rq.template
Expand Down
54 changes: 0 additions & 54 deletions config/system.trig
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ services:
- HTTP_REDIRECT_PORT=${HTTPS_PORT}
- HTTPS_PROXY_PORT=${HTTPS_PORT}
- HTTPS=false
- CONTEXT_ENDPOINT_URL=http://fuseki-end-user:3030/ds/
- SELF_SIGNED_CERT=true # only on localhost
- SIGN_UP_CERT_VALIDITY=180
- MAX_CONTENT_LENGTH=${MAX_CONTENT_LENGTH:-2097152}
Expand Down Expand Up @@ -93,7 +94,8 @@ services:
- ./datasets/secretary:/var/linkeddatahub/datasets/secretary
- ./uploads:/var/www/linkeddatahub/uploads
- ./config/dev.log4j.properties:/usr/local/tomcat/webapps/ROOT/WEB-INF/classes/log4j.properties:ro
- ./config/system.trig:/var/linkeddatahub/datasets/system.trig:ro
- ./platform/datasets/end-user.trig:/var/linkeddatahub/datasets/end-user.trig:ro
- ./platform/datasets/admin.trig:/var/linkeddatahub/datasets/admin.trig:ro
fuseki-admin:
image: atomgraph/fuseki:4.7.0
user: root # otherwise fuseki user does not have permissions to the mounted folder which is owner by root
Expand Down
6 changes: 3 additions & 3 deletions platform/context.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ xmlns:orcid="&orcid;"
<xsl:param name="ldhc:clientTrustStorePassword"/>
<xsl:param name="ldhc:uploadRoot"/>
<xsl:param name="ldhc:signUpCertValidity"/>
<xsl:param name="ldhc:contextDataset"/>
<xsl:param name="ldhc:contextEndpoint"/>
<xsl:param name="ldhc:authQuery"/>
<xsl:param name="ldhc:ownerAuthQuery"/>
<xsl:param name="ldhc:enableLinkedDataProxy"/>
Expand Down Expand Up @@ -108,8 +108,8 @@ xmlns:orcid="&orcid;"
<xsl:if test="$ldhc:signUpCertValidity">
<Parameter name="&ldhc;signUpCertValidity" value="{$ldhc:signUpCertValidity}" override="false"/>
</xsl:if>
<xsl:if test="$ldhc:contextDataset">
<Parameter name="&ldhc;contextDataset" value="{$ldhc:contextDataset}" override="false"/>
<xsl:if test="$ldhc:contextEndpoint">
<Parameter name="&ldhc;contextEndpoint" value="{$ldhc:contextEndpoint}" override="false"/>
</xsl:if>
<xsl:if test="$ldhc:authQuery">
<Parameter name="&ldhc;authQuery" value="{$ldhc:authQuery}" override="false"/>
Expand Down
Loading
Loading