Skip to content

Commit

Permalink
Issue 224 Fixed - Dead code removed (#241)
Browse files Browse the repository at this point in the history 
* Issue 224 Fixed - Dead code removed

* Issue 224 Fixed - Dead code removed and Milliner README fixed
  • Loading branch information
Gavin Morris authored Oct 19, 2022
1 parent ba31a7d commit 404caed
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
4 changes: 1 addition & 3 deletions hypercube/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ RUN --mount=type=cache,id=hypercube-apk,sharing=locked,from=cache,target=/var/ca
addgroup nginx jwt && \
cleanup.sh

ENV \
HYPERCUBE_FCREPO_URL=fcrepo/fcrepo/rest \
HYPERCUBE_LOG_LEVEL=info
ENV HYPERCUBE_LOG_LEVEL=info

COPY --from=crayfish /etc/nginx/http.d/default.conf /etc/nginx/http.d/default.conf
COPY --from=crayfish --chown=nginx:nginx /var/www /var/www
Expand Down
3 changes: 1 addition & 2 deletions hypercube/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ additional settings, volumes, ports, etc.

## Settings

| Environment Variable | Confd Key | Default | Description |
| Environment Variable | Confd Key | Default | Description |
| :------------------- | :-------------------- | :----------------- | :------------------------------------------------------------------------------------------------ |
| HYPERCUBE_FCREPO_URL | /hypercube/fcrepo/url | fcrepo/fcrepo/rest | Fcrepo Rest API URL |
| HYPERCUBE_LOG_LEVEL | /hypercube/log/level | debug | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |

[Hypercube]: https://github.com/Islandora/Crayfish/tree/main/Hypercube
2 changes: 0 additions & 2 deletions hypercube/rootfs/etc/confd/templates/config.yaml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ hypercube:
# path to the convert executable
tesseract_executable: tesseract
pdftotext_executable: pdftotext
fedora_resource:
base_url: {{ getenv "HYPERCUBE_FCREPO_URL" }}
log:
# Valid log levels are:
# debug, info, notice, warning, error, critical, alert, emergency, none
Expand Down
12 changes: 6 additions & 6 deletions milliner/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ additional settings, volumes, ports, etc.

## Settings

| Environment Variable | Confd Key | Default | Description |
| :------------------- | :------------------- | :----------------- | :------------------------------------------------------------------------------------------------ |
| MILLINER_DRUPAL_URL | /milliner/drupal/url | drupal:80 | Drupal URL |
| MILLINER_FCREPO_URL | /milliner/fcrepo/url | fcrepo/fcrepo/rest | Fcrepo Rest API URL |
| MILLINER_FCREPO6 | /milliner/fcrepo6 | false | Set to "true" if using Fedora 6 and set to "false" if using Fedora 4 or 5 |
| MILLINER_LOG_LEVEL | /milliner/log/level | debug | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |
| Environment Variable | Confd Key | Default | Description |
| :------------------- | :------------------- | :---------------------- | :------------------------------------------------------------------------------------------------ |
| MILLINER_DRUPAL_URL | /milliner/drupal/url | drupal:80 | Drupal URL |
| MILLINER_FCREPO_URL | /milliner/fcrepo/url | fcrepo:8080/fcrepo/rest | Fcrepo Rest API URL |
| MILLINER_FCREPO6 | /milliner/fcrepo6 | false | Set to "true" if using Fedora 6 and set to "false" if using Fedora 4 or 5 |
| MILLINER_LOG_LEVEL | /milliner/log/level | debug | Log level. Possible Values: debug, info, notice, warning, error, critical, alert, emergency, none |

[Milliner]: https://github.com/Islandora/Crayfish/tree/main/Milliner

0 comments on commit 404caed

Please sign in to comment.