rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add easyrdf.patch

Browse source
This commit is contained in:
Tom Wiesing 2020-07-02 15:12:25 +02:00
parent 56a44f8db3
commit e63c393216
No known key found for this signature in database
GPG key ID: DC1F29F2BC78AB15
4 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
distillery/resources/compose/runtime/.dockerignore
View file

@ -4,3 +4,4 @@
# allow the following files: # allow the following files:
!conf/* !conf/*
!scripts/* !scripts/*
!patch/*

3
distillery/resources/compose/runtime/Dockerfile
View file

@ -51,6 +51,9 @@ ENV PATH "/usr/local/bin:/var/www/data/project/vendor/bin:$PATH"
# remove default configuration # remove default configuration
RUN rm /etc/apache2/sites-available/*.conf && \ RUN rm /etc/apache2/sites-available/*.conf && \
rm /etc/apache2/sites-enabled/*.conf rm /etc/apache2/sites-enabled/*.conf
ADD patch/easyrdf.patch /patch/easyrdf.patch
# Add wisski configuration # Add wisski configuration
ADD conf/ports.conf /etc/apache2/ports.conf ADD conf/ports.conf /etc/apache2/ports.conf
ADD conf/wisski.conf /etc/apache2/sites-available/wisski.conf ADD conf/wisski.conf /etc/apache2/sites-available/wisski.conf

4
distillery/resources/compose/runtime/patch/easyrdf.patch Normal file
View file

@ -0,0 +1,4 @@
281c281
< if (preg_match("|^HTTP/([\d\.x]+) (\d+) ([^\r\n]+)|", $status, $m)) {
---
> if(preg_match("|^HTTP/([\d\.x]+) (\d+) ([^\r\n]*)|", $status, $m)) {

5
distillery/resources/compose/runtime/scripts/provision_container.sh
View file

@ -107,6 +107,11 @@ log_info " => Enable Wisski modules"
drush pm-enable --yes wisski_core wisski_linkblock wisski_pathbuilder wisski_adapter_sparql11_pb wisski_salz drush pm-enable --yes wisski_core wisski_linkblock wisski_pathbuilder wisski_adapter_sparql11_pb wisski_salz
drupal_sites_permission_workaround drupal_sites_permission_workaround
# Because of a regresssion in EasyRDF and Tomcat, we need to manually patch EasyRDF
EASYRDF_RESPONSE="$COMPOSER_DIR/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php"
log_info " => Patching '$EASYRDF_RESPONSE'"
patch "$EASYRDF_RESPONSE" < "/patch/easyrdf.patch"
log_info " => Provisioning is now complete. " log_info " => Provisioning is now complete. "
log_ok "Your installation details are as follows:" log_ok "Your installation details are as follows:"
function printdetails() { function printdetails() {