From 802252a1dce7d689121d7bb20a1090dec956a143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6nig?= <Alexander.Koenig@eurac.edu>
Date: Mon, 1 Jul 2019 15:39:19 +0200
Subject: [PATCH] changed all files from clarin-dev to clarin
---
dockerfiles/Dockerfile.nginx | 10 +++----
.../commul-customization/aa-statistics.php | 2 +-
dockerfiles/commul-customization/aai.js | 6 ++---
.../commul-customization/aai_config.js | 2 +-
.../clarin.eurac.edu.template.metadata.xml | 16 ++++++------
dockerfiles/commul-customization/default-ssl | 8 +++---
.../commul-customization/local.properties | 26 +++++++++----------
.../commul-customization/shibboleth2.xml | 4 +--
.../commul-customization/webpage/index.html | 4 +--
kubernetes/dspace-deployment.yaml | 8 +++---
kubernetes/dspace-ingress.yaml | 6 ++---
kubernetes/dspace-service.yaml | 2 +-
kubernetes/handle-service.yaml | 2 +-
kubernetes/nginx-deployment.yaml | 10 +++----
kubernetes/nginx-service.yaml | 2 +-
kubernetes/pgdata-persistentvolumeclaim.yaml | 2 +-
kubernetes/postgres-deployment.yaml | 4 +--
kubernetes/postgres-service.yaml | 2 +-
18 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/dockerfiles/Dockerfile.nginx b/dockerfiles/Dockerfile.nginx
index ea2743d..483c1b5 100644
--- a/dockerfiles/Dockerfile.nginx
+++ b/dockerfiles/Dockerfile.nginx
@@ -50,7 +50,7 @@ RUN ln -s /opt/nginx/sbin/nginx /usr/sbin/nginx
# copy over static html
COPY commul-customization/webpage/ /opt/nginx/html/
# copy over robots.txt
-COPY commul-customization/robots-clarin-dev.txt /opt/nginx/html/robots.txt
+COPY commul-customization/robots-clarin.txt /opt/nginx/html/robots.txt
COPY commul-customization/google4a439c0ac1ac30d0.html /opt/nginx/html/
RUN chown -R www-data:www-data /opt/nginx/html/
@@ -116,11 +116,11 @@ WORKDIR /opt/repository/sources/lindat-aai-discovery/
# RUN make aai.min.js
RUN yui-compressor -o aai.min.js aai.js
-# copy certificate for clarin-dev
-# COPY commul-customization/certs/clarin-dev.key /etc/ssl/private/
-# COPY commul-customization/certs/clarin-dev_eurac_edu.crt /etc/ssl/certs/
+# copy certificate for clarin
+# COPY commul-customization/certs/clarin.key /etc/ssl/private/
+# COPY commul-customization/certs/clarin_eurac_edu.crt /etc/ssl/certs/
-# if deployed on clarin instead of clarin-dev comment the two lines above and uncomment the following lines
+# if deployed on clarin instead of clarin comment the two lines above and uncomment the following lines
## copy certificate for clarin
# COPY commul-customization/certs/clarin.key /etc/ssl/private/
diff --git a/dockerfiles/commul-customization/aa-statistics.php b/dockerfiles/commul-customization/aa-statistics.php
index 4acf6ec..f8b2bf6 100644
--- a/dockerfiles/commul-customization/aa-statistics.php
+++ b/dockerfiles/commul-customization/aa-statistics.php
@@ -17,7 +17,7 @@ header('Location: ' . $_GET['return'], true, 302);
// REST api of the aggregator
$aggregator_url='https://clarin-aa.ms.mff.cuni.cz/aaggreg/v1/got';
//your SP entity id
-$sp='https://clarin-dev.eurac.edu/Shibboleth.sso/Metadata';
+$sp='https://clarin.eurac.edu/Shibboleth.sso/Metadata';
//====== /CONFIGURATION ======
diff --git a/dockerfiles/commul-customization/aai.js b/dockerfiles/commul-customization/aai.js
index 03edd64..82d8185 100644
--- a/dockerfiles/commul-customization/aai.js
+++ b/dockerfiles/commul-customization/aai.js
@@ -2,19 +2,19 @@
(function(window){
function AAI() {
var host = 'https://' + window.location.hostname,
- ourEntityID = host.match("clarin-dev.eurac.edu") ? "https://clarin-dev.eurac.edu" : host;
+ ourEntityID = host.match("clarin.eurac.edu") ? "https://clarin.eurac.edu" : host;
this.defaults = {
//host : 'https://ufal-point.mff.cuni.cz',
host : host, //better default (useful when testing on ufal-point-dev)
// do not add protocol because an error will appear in the DJ dialog
// if you see the error, your SP is not listed among djc trusted (edugain is enough to be trusted)
- responseUrl: window.location.protocol + '//clarin-dev.eurac.edu/aai/discojuiceDiscoveryResponse.html',
+ responseUrl: window.location.protocol + '//clarin.eurac.edu/aai/discojuiceDiscoveryResponse.html',
ourEntityID: ourEntityID + '/Shibboleth.sso/Metadata',
serviceName: '',
metadataFeed: host + '/xmlui/discojuice/feeds',
selector: 'a.signon', // selector for login button
autoInitialize: true, // auto attach DiscoJuice to DOM
- textHelpMore: "First check you are searching under the right country.\nIf your provider is not listed, please read <a href='https://clarin-dev.eurac.edu/how-do-i-sign-up' style='text-decoration: underline; font-weight: bold;'>these instructions</a> to obtain an account."
+ textHelpMore: "First check you are searching under the right country.\nIf your provider is not listed, please read <a href='https://clarin.eurac.edu/how-do-i-sign-up' style='text-decoration: underline; font-weight: bold;'>these instructions</a> to obtain an account."
};
this.setup = function(options) {
var opts = jQuery.extend({}, this.defaults, options),
diff --git a/dockerfiles/commul-customization/aai_config.js b/dockerfiles/commul-customization/aai_config.js
index b2ff2fd..35e6e4d 100644
--- a/dockerfiles/commul-customization/aai_config.js
+++ b/dockerfiles/commul-customization/aai_config.js
@@ -19,7 +19,7 @@ jQuery(document).ready(
//In order to use the discojuice store (improve score of used IDPs)
//Works only with "verified" SPs - ie. ufal-point, displays error on ufal-point-dev
instance.responseUrl =
- (window.location.hostname.search("clarin-dev") >= 0) ?
+ (window.location.hostname.search("clarin") >= 0) ?
"" :
instance.host + instance.port + instance.repoPath +
"themes/UFAL/lib/html/disco-juice.html?";
diff --git a/dockerfiles/commul-customization/clarin.eurac.edu.template.metadata.xml b/dockerfiles/commul-customization/clarin.eurac.edu.template.metadata.xml
index 2490ce5..56f2639 100644
--- a/dockerfiles/commul-customization/clarin.eurac.edu.template.metadata.xml
+++ b/dockerfiles/commul-customization/clarin.eurac.edu.template.metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_5d15d5a81bc952da1d34986ebc7713c0d5c9ea61" entityID="https://clarin-dev.eurac.edu/Shibboleth.sso/Metadata">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_5d15d5a81bc952da1d34986ebc7713c0d5c9ea91" entityID="https://clarin.eurac.edu/Shibboleth.sso/Metadata">
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
@@ -26,13 +26,13 @@
<mdui:Description xml:lang="en">Eurac Research CLARIN Centre: Digital repository for language data</mdui:Description>
<mdui:Description xml:lang="de">Eurac Research CLARIN Centre: Digitales Repository für Sprachdaten</mdui:Description>
<mdui:Description xml:lang="it">Eurac Research CLARIN Centre: repository digitale di risorse linguistiche</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://clarin-dev.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
- <mdui:InformationURL xml:lang="de">https://clarin-dev.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
- <mdui:InformationURL xml:lang="it">https://clarin-dev.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
- <mdui:Logo height="85" width="180">https://clarin-dev.eurac.edu/repository/xmlui/themes/UFAL/lib/lindat/public/img/eurac_research.svg</mdui:Logo>
- <mdui:PrivacyStatementURL xml:lang="en">https://clarin-dev.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="de">https://clarin-dev.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="it">https://clarin-dev.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:InformationURL xml:lang="en">https://clarin.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="de">https://clarin.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="it">https://clarin.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
+ <mdui:Logo height="85" width="180">https://clarin.eurac.edu/repository/xmlui/themes/UFAL/lib/lindat/public/img/eurac_research.svg</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="en">https://clarin.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="de">https://clarin.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="it">https://clarin.eurac.edu/repository/xmlui/page/registration-privacypolicy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:AttributeConsumingService index="1">
diff --git a/dockerfiles/commul-customization/default-ssl b/dockerfiles/commul-customization/default-ssl
index 2b6f9e5..cc58810 100644
--- a/dockerfiles/commul-customization/default-ssl
+++ b/dockerfiles/commul-customization/default-ssl
@@ -6,7 +6,7 @@ upstream tomcats {
server {
listen 80;
listen [::]:80;
- server_name clarin-dev.eurac.edu;
+ server_name clarin.eurac.edu;
location /repository/oai {
@@ -29,14 +29,14 @@ server {
server {
listen 443;
- server_name clarin-dev.eurac.edu localhost;
+ server_name clarin.eurac.edu localhost;
root /opt/nginx/html;
index index.html index.htm;
ssl on;
- ssl_certificate /etc/ssl/clarin/clarin-dev_eurac_edu.crt;
- ssl_certificate_key /etc/ssl/clarin/clarin-dev.key;
+ ssl_certificate /etc/ssl/clarin/clarin_eurac_edu.crt;
+ ssl_certificate_key /etc/ssl/clarin/clarin.key;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers RC4:HIGH:!aNULL:!MD5;
diff --git a/dockerfiles/commul-customization/local.properties b/dockerfiles/commul-customization/local.properties
index d612588..e980837 100644
--- a/dockerfiles/commul-customization/local.properties
+++ b/dockerfiles/commul-customization/local.properties
@@ -15,12 +15,12 @@ lr.pid.service.testPid =
# multiple configurations can be given separated by semicolon
# default configuration should have asterisk as the community ID
# subprefix is only used for local handles
-lr.pid.community.configurations = community=*,prefix=20.500.12084,type=local,canonical_prefix=http://hdl.handle.net/
+lr.pid.community.configurations = community=*,prefix=20.500.12124,type=local,canonical_prefix=http://hdl.handle.net/
# if true, PID metadata will be filled with object metadata like title
lr.pid.resolvemetadata = true
handle.canonical.prefix = http://hdl.handle.net/
-handle.prefix = 20.500.12084
+handle.prefix = 20.500.12124
handle.dir=${dspace.dir}/handle-server
lr.reserve.pid.on.start = false
@@ -32,15 +32,15 @@ lr.harvestable.assetstore =
# DSpace host name - should match base URL. Do not include protocol i.e. http or https and do not include port, this is only the name of server.
# Also do not use localhost because using this property some external links will be generated.
-dspace.hostname = clarin-dev.eurac.edu
+dspace.hostname = clarin.eurac.edu
# DSpace base URL, the full url of the instance
# !!! URL must NOT contain trailing slash !!!
-dspace.baseUrl = https://clarin-dev.eurac.edu/repository
+dspace.baseUrl = https://clarin.eurac.edu/repository
# OAI webapp url without context (eg. /request) use http
# in theory ${dspace.baseUrl}/oai except for the http requirement
-dspace.oai.url = http://clarin-dev.eurac.edu/repository/oai
+dspace.oai.url = http://clarin.eurac.edu/repository/oai
# DSpace URL, usually ending with /xmlui
# DSpace base URL. Include port number etc., but NOT trailing slash
@@ -277,13 +277,13 @@ lr.upload.file.alert.max.file.size = 2147483648
lr.shibboleth.log.path = /opt/shibboleth-sp-fastcgi/var/log/shibboleth
lr.shibboleth.log.defaultName = shibd.log
#the place where you run shibboleth's discoFeed handler ("https://"+hostname+"/Shibboleth.sso/DiscoFeed")
-lr.shibboleth.discofeed.url = https://clarin-dev.eurac.edu/Shibboleth.sso/DiscoFeed
+lr.shibboleth.discofeed.url = https://clarin.eurac.edu/Shibboleth.sso/DiscoFeed
####
#
# discojuice/aai url, without trailing slash
# don't change this on ufal-point-dev!
-lr.aai.url = https://clarin-dev.eurac.edu/aai
+lr.aai.url = https://clarin.eurac.edu/aai
# For reports
harvesterInfo.url = http://catalog.clarin.eu/oai-harvester/
@@ -298,22 +298,22 @@ lr.xmlui.user.showlanguage = false
###############################################
# oai
#mind the documentation for oai/cite and the respective apache rewrite
-lr.repository.identifier = clarin-dev.eurac.edu
-lr.repository.sampleIdentifier = oai:clarin-dev.eurac.edu:20.500.12124/3
+lr.repository.identifier = clarin.eurac.edu
+lr.repository.sampleIdentifier = oai:clarin.eurac.edu:20.500.12124/3
####
#
# description-olac.xml
####
-lr.description.archiveURL = http://clarin-dev.eurac.edu/
+lr.description.archiveURL = http://clarin.eurac.edu/
lr.description.participant.name = Alexander König
lr.description.institution = Eurac Research, Institute for Applied Linguistics
lr.description.institutionURL = http://www.eurac.edu/linguistics
lr.description.shortLocation = Bolzano, Italy
lr.description.location = Viale Druso, 1 / Drususallee 1, 39100 Bolzano / Bozen - Italy
lr.description.synopsis = http://www.eurac.edu
-lr.desription.access = https://clarin-dev.eurac.edu/repository/xmlui/page/about
-lr.description.archivalSubmissionPolicy = https://clarin-dev.eurac.edu/repository/xmlui/page/about
+lr.desription.access = https://clarin.eurac.edu/repository/xmlui/page/about
+lr.description.archivalSubmissionPolicy = https://clarin.eurac.edu/repository/xmlui/page/about
############################################
@@ -383,7 +383,7 @@ lr.link.checker.connect.timeout = 2000
lr.link.checker.read.timeout = 3000
### Entity ID of your shibboleth sp
-lr.spEntityId = http://clarin-dev.eurac.edu/sp/shibboleth
+lr.spEntityId = http://clarin.eurac.edu/sp/shibboleth
#####
#
diff --git a/dockerfiles/commul-customization/shibboleth2.xml b/dockerfiles/commul-customization/shibboleth2.xml
index 4af464b..d97f319 100644
--- a/dockerfiles/commul-customization/shibboleth2.xml
+++ b/dockerfiles/commul-customization/shibboleth2.xml
@@ -23,7 +23,7 @@
-->
<RequestMapper type="XML">
<RequestMap>
- <Host name="clarin-dev.eurac.edu"
+ <Host name="clarin.eurac.edu"
authType="shibboleth"
requireSession="true"
exportAssertion="true"
@@ -35,7 +35,7 @@
</RequestMapper>
<!-- The ApplicationDefaults element is where most of Shibboleth's SAML bits are defined. -->
- <ApplicationDefaults entityID="https://clarin-dev.eurac.edu/Shibboleth.sso/Metadata"
+ <ApplicationDefaults entityID="https://clarin.eurac.edu/Shibboleth.sso/Metadata"
REMOTE_USER="eppn persistent-id targeted-id"
sessionHook="/php/aa-statistics.php"
cipherSuites="ECDHE+AESGCM:ECDHE:!aNULL:!eNULL:!LOW:!EXPORT:!RC4:!SHA:!SSLv2">
diff --git a/dockerfiles/commul-customization/webpage/index.html b/dockerfiles/commul-customization/webpage/index.html
index 67e2380..1510b16 100644
--- a/dockerfiles/commul-customization/webpage/index.html
+++ b/dockerfiles/commul-customization/webpage/index.html
@@ -33,7 +33,7 @@
<div id="maintext">
<p>The Eurac Research CLARIN Centre (ERCC) is a dedicated repository for language data. It is hosted by the Institute for Applied Linguistics (IAL) at Eurac Research, a private research centre based in Bolzano, South Tyrol. The Centre is part of the Europe-wide CLARIN infrastructure, which means that it follows well-defined international standards for (meta)data and procedures and is well-embedded in the wider European Linguistics infrastructure. The repository hosts data collected at the IAL, but is also open for data deposits from external collaborators.</p>
<div id="buttondiv">
- <a href="https://clarin-dev.eurac.edu/repository/xmlui/" class="button">
+ <a href="https://clarin.eurac.edu/repository/xmlui/" class="button">
<span id="buttontext">Continue to the repository</span></a>
</div>
<p><a href="http://www.eurac.edu">Eurac Research</a> is a private non-profit research center located in the heart of the Alps in Bolzano, South Tyrol. It is funded by the local and regional government and through external projects. Today, over 25 years after it was funded, more than 400 scientists from over 30 countries work here in a wide number of different research fields.</p>
@@ -42,7 +42,7 @@
<p><a href="https://www.clarin.eu">CLARIN</a> is a pan-European project organised as an European Research Infrastructure Consortium (ERIC) with about 20 participating member countries. Its ultimate objective is to advance research in the humanities and social sciences by giving researchers unified single sign-on access to a platform which integrates language-based resources and advanced tools at a European level.</p>
-<p><a href="https://clarin-dev.eurac.edu/repository/xmlui/page/about">Read More...</a></p>
+<p><a href="https://clarin.eurac.edu/repository/xmlui/page/about">Read More...</a></p>
</div>
</div>
</div>
diff --git a/kubernetes/dspace-deployment.yaml b/kubernetes/dspace-deployment.yaml
index 7811e75..50126fd 100644
--- a/kubernetes/dspace-deployment.yaml
+++ b/kubernetes/dspace-deployment.yaml
@@ -8,7 +8,7 @@ metadata:
labels:
io.kompose.service: dspace
name: dspace
- namespace: dspace-dev
+ namespace: dspace
spec:
replicas: 1
strategy: {}
@@ -50,7 +50,7 @@ spec:
secretKeyRef:
key: mail.pass
name: dspace-secrets
- image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.3.2-RC1
+ image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/dspace:1.3.2
name: clarin-dspace
imagePullPolicy: Always
ports:
@@ -64,7 +64,7 @@ spec:
name: dspace-assetstore
livenessProbe:
httpGet:
- host: clarin-dev.eurac.edu
+ host: clarin.eurac.edu
path: /repository/xmlui/
port: 443
scheme: HTTPS
@@ -82,7 +82,7 @@ spec:
- 10.8.55.203:6789
- 10.7.55.201:6789
- 10.7.55.202:6789
- path: /eurac/commul/projects/clarin/kubernetes/dspace-dev/assetstore
+ path: /eurac/commul/projects/clarin/kubernetes/dspace/assetstore
secretRef:
name: client.fs.commul.admin
user: fs.commul.admin
diff --git a/kubernetes/dspace-ingress.yaml b/kubernetes/dspace-ingress.yaml
index 23e1451..a56804c 100644
--- a/kubernetes/dspace-ingress.yaml
+++ b/kubernetes/dspace-ingress.yaml
@@ -19,10 +19,10 @@ metadata:
}
ingress.kubernetes.io/secure-backends: "true"
name: dspace-ingress
- namespace: dspace-dev
+ namespace: dspace
spec:
rules:
- - host: clarin-dev.eurac.edu
+ - host: clarin.eurac.edu
http:
paths:
- backend:
@@ -31,5 +31,5 @@ spec:
path: /
tls:
- hosts:
- - clarin-dev.eurac.edu
+ - clarin.eurac.edu
secretName: host-tls-cert
diff --git a/kubernetes/dspace-service.yaml b/kubernetes/dspace-service.yaml
index 652d898..ad26b07 100644
--- a/kubernetes/dspace-service.yaml
+++ b/kubernetes/dspace-service.yaml
@@ -8,7 +8,7 @@ metadata:
labels:
io.kompose.service: dspace
name: dspace
- namespace: dspace-dev
+ namespace: dspace
spec:
ports:
- name: "8080"
diff --git a/kubernetes/handle-service.yaml b/kubernetes/handle-service.yaml
index 6b9c253..73feaa5 100644
--- a/kubernetes/handle-service.yaml
+++ b/kubernetes/handle-service.yaml
@@ -8,7 +8,7 @@ metadata:
labels:
io.kompose.service: dspace
name: handle-service
- namespace: dspace-dev
+ namespace: dspace
spec:
ports:
- name: "8000"
diff --git a/kubernetes/nginx-deployment.yaml b/kubernetes/nginx-deployment.yaml
index 4a7fd76..8e3d0ac 100644
--- a/kubernetes/nginx-deployment.yaml
+++ b/kubernetes/nginx-deployment.yaml
@@ -8,7 +8,7 @@ metadata:
labels:
io.kompose.service: nginx
name: nginx
- namespace: dspace-dev
+ namespace: dspace
spec:
replicas: 1
strategy:
@@ -20,7 +20,7 @@ spec:
io.kompose.service: nginx
spec:
containers:
- - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/nginx:1.3.2-RC1
+ - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/nginx:1.3.2
imagePullPolicy: Always
name: clarin-nginx
ports:
@@ -34,7 +34,7 @@ spec:
name: nginx-ssl-certs
livenessProbe:
httpGet:
- host: clarin-dev.eurac.edu
+ host: clarin.eurac.edu
port: 443
scheme: HTTPS
initialDelaySeconds: 30
@@ -51,7 +51,7 @@ spec:
- 10.8.55.203:6789
- 10.7.55.201:6789
- 10.7.55.202:6789
- path: /eurac/commul/projects/clarin/kubernetes/dspace-dev/ssl-certs
+ path: /eurac/commul/projects/clarin/kubernetes/dspace/ssl-certs
secretRef:
name: client.fs.commul.admin
user: fs.commul.admin
@@ -63,7 +63,7 @@ spec:
- 10.8.55.203:6789
- 10.7.55.201:6789
- 10.7.55.202:6789
- path: /eurac/commul/projects/clarin/kubernetes/dspace-dev/shib-certs
+ path: /eurac/commul/projects/clarin/kubernetes/dspace/shib-certs
secretRef:
name: client.fs.commul.admin
user: fs.commul.admin
diff --git a/kubernetes/nginx-service.yaml b/kubernetes/nginx-service.yaml
index 8b48d62..99b3bf8 100644
--- a/kubernetes/nginx-service.yaml
+++ b/kubernetes/nginx-service.yaml
@@ -8,7 +8,7 @@ metadata:
labels:
io.kompose.service: nginx
name: nginx
- namespace: dspace-dev
+ namespace: dspace
spec:
ports:
- name: "80"
diff --git a/kubernetes/pgdata-persistentvolumeclaim.yaml b/kubernetes/pgdata-persistentvolumeclaim.yaml
index 141c12b..db10fd1 100644
--- a/kubernetes/pgdata-persistentvolumeclaim.yaml
+++ b/kubernetes/pgdata-persistentvolumeclaim.yaml
@@ -8,7 +8,7 @@ metadata:
labels:
io.kompose.service: pgdata
name: dspace-pgdata
- namespace: dspace-dev
+ namespace: dspace
spec:
accessModes:
- ReadWriteOnce
diff --git a/kubernetes/postgres-deployment.yaml b/kubernetes/postgres-deployment.yaml
index 9f4d7fe..5ce83a6 100644
--- a/kubernetes/postgres-deployment.yaml
+++ b/kubernetes/postgres-deployment.yaml
@@ -8,7 +8,7 @@ metadata:
labels:
io.kompose.service: postgres
name: postgres
- namespace: dspace-dev
+ namespace: dspace
spec:
replicas: 1
strategy:
@@ -48,7 +48,7 @@ spec:
secretKeyRef:
key: dspace.utils.name
name: dspace-secrets
- image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/postgres:1.3.2-RC1
+ image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/production/postgres:1.3.2
imagePullPolicy: Always
name: clarin-postgres
resources: {}
diff --git a/kubernetes/postgres-service.yaml b/kubernetes/postgres-service.yaml
index 7f9786b..d6a69c2 100644
--- a/kubernetes/postgres-service.yaml
+++ b/kubernetes/postgres-service.yaml
@@ -8,7 +8,7 @@ metadata:
labels:
io.kompose.service: postgres
name: postgres
- namespace: dspace-dev
+ namespace: dspace
spec:
clusterIP: None
ports:
--
GitLab