diff --git a/dockerfiles/Dockerfile.nginx b/dockerfiles/Dockerfile.nginx
index ea2743d856aa784aa5383bf62b9e285ba54e5684..483c1b5e5e2a5c6535db7a9027ab8941f32279b6 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 4acf6ec7f987747cac3db143d613200e5ab87816..f8b2bf61ac6ca344092fb6a1301677e6b88e7baa 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 03edd649911917c8fb7ecfc352a0152ea6141669..82d8185e2ffafb75cd9d606ce11d6840d6a85659 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 b2ff2fd356de75710f1a3a6cd729acdeee5c5a84..35e6e4dd730fe5958590f7289bb18ca2b2d2b264 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 2490ce5a300a7031823dbe926df9832db8f3e41d..56f2639cfad9bc6c7c5d0fa7301284f398b7a690 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 2b6f9e5f3dc85609960ee6d7810921d6e790082c..cc58810b8116fc1198c43f25ff5a1da4d99551bb 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 d612588187e9ac8c36815e608f10fa0114d94566..e98083714e3c8662b0c8f46c6af3167d87f6015a 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 4af464bae485203547e9c5d1ee362be84b3b506a..d97f3191f5bdf5167a1ee87678e2aebe10c30b67 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 67e23805ba03a44dface79e3c69e38572167286c..1510b167810e47883f1a1bd9848b97c0d510b4dc 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 7811e75ee1dbd67f03892266926577e3ac24229a..50126fd431caed5ad0168e507ea63391d6f75b9b 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 23e145173b0779078880825257d6d7804075547b..a56804cdb171ceaa205f4c98df7d4b70ac1a2358 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 652d898c10ec7f5813a49d9cb8e2f9e29bcbe38e..ad26b072f5cec0ddd0f225fb3380e1d8415d7e51 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 6b9c2532fcd0619bcd27bd29145617d23d05dec8..73feaa550bf5e19a72de5ddb0377eac2063a860e 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 4a7fd7603011e0e4a643fe1d145291b16ab74ab9..8e3d0acf07eb78893af2ed7c84d3e045033d58ec 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 8b48d62cde69f1b87861c82d0aa25337d11e1597..99b3bf8585a3e9c58c787878cf8a3fa9e1e4c5db 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 141c12b40da43b1d16a3e9a88d5848d879118265..db10fd10287c2b314ccdfa3d816ff58c73bf4336 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 9f4d7fe1859ff98dd6515679be2d24332794275a..5ce83a6d2e75be094cb68b28fedcbce3b1d6ab6e 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 7f9786b573d9e387522af5aa82df8eab8a0a31cc..d6a69c201177e85040405cb6180da0d65a37f67c 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: