Skip to content
Snippets Groups Projects
Commit 44f56972 authored by Alexander König's avatar Alexander König
Browse files

changed hostname everywhere from lindat-dev to clarin-dev

parent c991768a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 58 additions and 47 deletions
Dockerfile.nginx
+ 3
− 3
View file @ 44f56972
......@@ -90,13 +90,13 @@ RUN perl -pi -e 's/http/https/' /opt/repository/sources/lindat-aai-discovery/Mak
RUN touch /opt/repository/sources/lindat-aai-discovery/aai.js
RUN make aai.min.js
# copy certificate for lindat-dev
# copy certificate for clarin-dev
COPY commul-customization/certs/lindat-dev.key /etc/ssl/private/
COPY commul-customization/certs/lindat-dev_eurac_edu.pem /etc/ssl/certs/
# if deployed on lindat instead of lindat-dev comment the two lines above and uncomment the following lines
# if deployed on clarin instead of clarin-dev comment the two lines above and uncomment the following lines
## copy certificate for lindat
## copy certificate for clarin
# COPY commul-customization/certs/lindat_eurac_edu.key /etc/ssl/private/
# COPY commul-customization/certs/lindat_eurac_edu.crt /etc/ssl/certs/
......
lindat-dev2lindat.sh → clarin-dev2clarin.sh
+ 14
− 0
View file @ 44f56972
#!/bin/bash
# outside the docker
perl -pi -e 's/lindat-dev/lindat/g' commul-customization/shibboleth2.xml
perl -pi -e 's/lindat-dev/lindat/g' commul-customization/local.properties
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/shibboleth2.xml
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/local.properties
perl -pi -e 's/lindat-dev_eurac_edu.pem/lindat_eurac_edu.crt/;' commul-customization/default-ssl
perl -pi -e 's/lindat-dev.key/lindat_eurac_edu.key/;' commul-customization/default-ssl
perl -pi -e 's/lindat-dev/lindat/g' commul-customization/default-ssl
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/default-ssl
perl -pi -e 's/lindat-dev/lindat/g' commul-customization/aai.js
perl -pi -e 's/lindat-dev/lindat/g' commul-customization/aai_config.js
perl -pi -e 's/lindat-dev/lindat/g' commul-customization/lindat.eurac.edu.template.metadata.xml
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/aai.js
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/aai_config.js
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/lindat.eurac.edu.template.metadata.xml
echo "Modified all files to point to lindat.eurac.edu instead of lindat-dev.eurac.edu. Do not forget to also edit docker-compose.yml and Dockerfile.nginx."
echo "Modified all files to point to clarin.eurac.edu instead of clarin-dev.eurac.edu. Do not forget to also edit docker-compose.yml and Dockerfile.nginx."
commul-customization/aai.js
+ 3
− 3
View file @ 44f56972
......@@ -2,19 +2,19 @@
(function(window){
function AAI() {
var host = 'https://' + window.location.hostname,
ourEntityID = host.match("lindat-dev.eurac.edu") ? "https://lindat-dev.eurac.edu" : host;
ourEntityID = host.match("clarin-dev.eurac.edu") ? "https://clarin-dev.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 + '//lindat-dev.eurac.edu/aai/discojuiceDiscoveryResponse.html',
responseUrl: window.location.protocol + '//clarin-dev.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://lindat-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-dev.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),
......
commul-customization/aai_config.js
+ 1
− 1
View file @ 44f56972
"use strict";jQuery(document).ready(function(){var a=(function(){var b={};b.port=(window.location.port===""?"":":"+window.location.port);b.host=window.location.protocol+"//"+window.location.hostname;b.repoPath=jQuery("a#repository_path").attr("href");if(b.repoPath.charAt(b.repoPath.length-1)!=="/"){b.repoPath=b.repoPath+"/"}b.target=b.host+b.port+b.repoPath;b.responseUrl=(window.location.hostname.search("lindat-dev.eurac.edu")>=0)?"":b.host+b.port+b.repoPath+"themes/UFAL/lib/html/disco-juice.html?";b.metadataFeed=b.target+"discojuice/feeds";b.serviceName="Eurac Research CLARIN Centre";b.localauth='<form method="post" action="'+b.target+'password-login"> <p>Sign in using your local account obtained from the Eurac Research CLARIN Centre administrator.</p><p style="margin: 5px; color: #888" ><input type="text" name="login_email" style="font-size: 160%; width: 100%" id="login" /> <label for="login">E-Mail Address</label></p><p style="margin: 5px; color: #888" ><input type="password" name="login_password" style="font-size: 160%; width: 100%" id="pass" /> <label for="pass">Password</label></p><p style="margin: 5px; color: #607890; text-decoration: underline;"><a href="'+b.target+'forgot">Forgot your password?</a></p><p style="" ><input type="submit" style="margin: 20px 2px" name="submit" value="Sign in" /></p></form>';b.target=b.target+"shibboleth-login";return b})();if(!("aai" in window)){throw"Failed to find UFAL AAI object. See https://redmine.ms.mff.cuni.cz/projects/lindat-aai for more details!"}window.aai.setup(a)});
"use strict";jQuery(document).ready(function(){var a=(function(){var b={};b.port=(window.location.port===""?"":":"+window.location.port);b.host=window.location.protocol+"//"+window.location.hostname;b.repoPath=jQuery("a#repository_path").attr("href");if(b.repoPath.charAt(b.repoPath.length-1)!=="/"){b.repoPath=b.repoPath+"/"}b.target=b.host+b.port+b.repoPath;b.responseUrl=(window.location.hostname.search("clarin-dev.eurac.edu")>=0)?"":b.host+b.port+b.repoPath+"themes/UFAL/lib/html/disco-juice.html?";b.metadataFeed=b.target+"discojuice/feeds";b.serviceName="Eurac Research CLARIN Centre";b.localauth='<form method="post" action="'+b.target+'password-login"> <p>Sign in using your local account obtained from the Eurac Research CLARIN Centre administrator.</p><p style="margin: 5px; color: #888" ><input type="text" name="login_email" style="font-size: 160%; width: 100%" id="login" /> <label for="login">E-Mail Address</label></p><p style="margin: 5px; color: #888" ><input type="password" name="login_password" style="font-size: 160%; width: 100%" id="pass" /> <label for="pass">Password</label></p><p style="margin: 5px; color: #607890; text-decoration: underline;"><a href="'+b.target+'forgot">Forgot your password?</a></p><p style="" ><input type="submit" style="margin: 20px 2px" name="submit" value="Sign in" /></p></form>';b.target=b.target+"shibboleth-login";return b})();if(!("aai" in window)){throw"Failed to find UFAL AAI object. See https://redmine.ms.mff.cuni.cz/projects/lindat-aai for more details!"}window.aai.setup(a)});
commul-customization/lindat.eurac.edu.template.metadata.xml → commul-customization/clarin.eurac.edu.template.metadata.xml
+ 7
− 7
View file @ 44f56972
......@@ -22,13 +22,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://lindat-dev.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
<mdui:InformationURL xml:lang="de">https://lindat-dev.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
<mdui:InformationURL xml:lang="it">https://lindat-dev.eurac.edu/repository/xmlui/page/about</mdui:InformationURL>
<mdui:Logo height="85" width="180">https://lindat-dev.eurac.edu/img/eurac.png</mdui:Logo>
<mdui:PrivacyStatementURL xml:lang="en">https://lindat-dev.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="de">https://lindat-dev.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="it">https://lindat-dev.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
<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/img/eurac.png</mdui:Logo>
<mdui:PrivacyStatementURL xml:lang="en">https://clarin-dev.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="de">https://clarin-dev.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="it">https://clarin-dev.eurac.edu/repository/xmlui/page/privacypolicy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:AttributeConsumingService index="1">
......
commul-customization/default-ssl
+ 3
− 3
View file @ 44f56972
......@@ -6,13 +6,13 @@ upstream tomcats {
server {
listen 80;
listen [::]:80;
server_name lindat-dev.eurac.edu;
return 301 https://lindat-dev.eurac.edu$request_uri;
server_name clarin-dev.eurac.edu;
return 301 https://$server_name$request_uri;
}
server {
listen 443;
server_name lindat-dev.eurac.edu localhost;
server_name clarin-dev.eurac.edu localhost;
root /opt/nginx/html;
index index.html index.htm;
......
commul-customization/local.properties.dist
+ 12
− 12
View file @ 44f56972
......@@ -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 = lindat-dev.eurac.edu
dspace.hostname = clarin-dev.eurac.edu
# DSpace base URL, the full url of the instance
# !!! URL must NOT contain trailing slash !!!
dspace.baseUrl = https://lindat-dev.eurac.edu/repository
dspace.baseUrl = https://clarin-dev.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://lindat-dev.eurac.edu/repository/oai
dspace.oai.url = http://clarin-dev.eurac.edu/repository/oai
# DSpace URL, usually ending with /xmlui
# DSpace base URL. Include port number etc., but NOT trailing slash
......@@ -141,7 +141,7 @@ mail.admin = ${mail.feedback.recipient}
lr.errors.email=
# solr server address that your instance is using.
solr.server = http://lindat-dev.eurac.edu:8080/repository/solr
solr.server = http://clarin-dev.eurac.edu:8080/repository/solr
# Google Analytics
# NOTE: Copy appropriate Google Analytics API key file to the location specified
......@@ -270,13 +270,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://lindat-dev.eurac.edu/Shibboleth.sso/DiscoFeed
lr.shibboleth.discofeed.url = https://clarin-dev.eurac.edu/Shibboleth.sso/DiscoFeed
####
#
# discojuice/aai url, without trailing slash
# don't change this on ufal-point-dev!
lr.aai.url = https://lindat-dev.eurac.edu/aai
lr.aai.url = https://clarin-dev.eurac.edu/aai
# For reports
harvesterInfo.url = http://catalog.clarin.eu/oai-harvester/
......@@ -291,22 +291,22 @@ lr.xmlui.user.showlanguage = false
###############################################
# oai
#mind the documentation for oai/cite and the respective apache rewrite
lr.repository.identifier = lindat-dev.eurac.edu
lr.repository.sampleIdentifier = oai:lindat-dev.eurac.edu:11858/00-097C-0000-0001-487A-4
lr.repository.identifier = clarin-dev.eurac.edu
lr.repository.sampleIdentifier = oai:clarin-dev.eurac.edu:11858/00-097C-0000-0001-487A-4
####
#
# description-olac.xml
####
lr.description.archiveURL = http://lindat-dev.eurac.edu/
lr.description.archiveURL = http://clarin-dev.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://lindat-dev.eurac.edu/repository/xmlui/page/about
lr.description.archivalSubmissionPolicy = https://lindat-dev.eurac.edu/repository/xmlui/page/about
lr.desription.access = https://clarin-dev.eurac.edu/repository/xmlui/page/about
lr.description.archivalSubmissionPolicy = https://clarin-dev.eurac.edu/repository/xmlui/page/about
############################################
......@@ -376,7 +376,7 @@ lr.link.checker.connect.timeout = 2000
lr.link.checker.read.timeout = 3000
### Entity ID of your shibboleth sp
lr.spEntityId = http://lindat-dev.eurac.edu/sp/shibboleth
lr.spEntityId = http://clarin-dev.eurac.edu/sp/shibboleth
#####
#
......
commul-customization/shibboleth2.xml
+ 2
− 2
View file @ 44f56972
......@@ -23,7 +23,7 @@
-->
<RequestMapper type="XML">
<RequestMap>
<Host name="lindat-dev.eurac.edu"
<Host name="clarin-dev.eurac.edu"
authType="shibboleth"
requireSession="true"
redirectToSSL="443">
......@@ -34,7 +34,7 @@
</RequestMapper>
<!-- The ApplicationDefaults element is where most of Shibboleth's SAML bits are defined. -->
<ApplicationDefaults entityID="https://lindat-dev.eurac.edu/Shibboleth.sso/Metadata"
<ApplicationDefaults entityID="https://clarin-dev.eurac.edu/Shibboleth.sso/Metadata"
REMOTE_USER="eppn persistent-id targeted-id"
cipherSuites="ECDHE+AESGCM:ECDHE:!aNULL:!eNULL:!LOW:!EXPORT:!RC4:!SHA:!SSLv2">
......
difference-between-clarin-dev-and-clarin.txt 0 → 100644
+ 12
− 0
View file @ 44f56972
Lindat Production workflow
nach Schritt './password_mod.sh'
./clarin-dev2clarin.sh
nach Schritt 'make new_deploy'
grep -rl clarin-dev /opt/lindat-common/public/ | xargs -i perl -pi -e 's/clarin-dev/clarin/g' {}
difference-between-lindat-dev-and-lindat.txt deleted 100644 → 0
+ 0
− 15
View file @ c991768a
Lindat Production workflow
nach Schritt './password_mod.sh'
chmod +x lindat-dev2lindat.sh
./lindat-dev2lindat.sh
aufpassen, dass man beim run des dspace containers den -h parameter anpasst (lindat anstatt lindat-dev)
nach Schritt 'make new_deploy'
grep -rl lindat-dev /opt/lindat-common/public/ | xargs -i perl -pi -e 's/lindat-dev/lindat/g' {}
docker-compose.yml
+ 1
− 1
View file @ 44f56972
......@@ -14,7 +14,7 @@ services:
context: .
dockerfile: Dockerfile.nginx
image: eurac_nginx
hostname: lindat-dev.eurac.edu
hostname: clarin-dev.eurac.edu
restart: always
ports:
- "80:80"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment