Skip to content

Commit 7f716f1

Browse files
author
Masaharu Hayashi
committed
update
1 parent bbf5418 commit 7f716f1

9 files changed

Lines changed: 20 additions & 95 deletions

File tree

‎docker-compose2.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ services:
384384
environment:
385385
- NODE_TLS_REJECT_UNAUTHORIZED=0
386386
extra_hosts:
387-
- ams.ir.rcos.nii.ac.jp:127.0.0.1
387+
- mebyo.ir.rcos.nii.ac.jp:127.0.0.1
388388

389389
# certbot:
390390
# image: certbot/certbot:latest

‎nginx/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ RUN sed -i 's/\/run\/php/\/tmp/g' /etc/php/7.4/fpm/php-fpm.conf
5858
RUN sed -i 's/\/run\/php/\/tmp/g' /etc/php/7.4/fpm/pool.d/www.conf
5959

6060
RUN mkdir -p /etc/shibboleth/cert
61-
ADD ./gakunin-test-signer-2020.cer /etc/shibboleth/cert/gakunin-test-signer-2020.cer
61+
# ADD ./gakunin-test-signer-2020.cer /etc/shibboleth/cert/gakunin-test-signer-2020.cer
6262
RUN mkdir /etc/shibboleth/keys
6363
ADD ./keys/shib.crt /etc/shibboleth/keys/server.crt
6464
ADD ./keys/shib.key /etc/shibboleth/keys/server.key
6565
ADD ./idp-metadata.xml /etc/shibboleth/idp-metadata.xml
6666
RUN mkdir -p /etc/shibboleth/metadata
67-
ADD ./orthros-idp-metadata.xml /etc/shibboleth/metadata/orthros-idp-metadata.xml
68-
ADD ./orthrosstg-idp-metadata.xml /etc/shibboleth/metadata/orthrosstg-idp-metadata.xml
69-
ADD ./sptestcgidp-metadata.xml /etc/shibboleth/metadata/sptestcgidp-metadata.xml
67+
# ADD ./orthros-idp-metadata.xml /etc/shibboleth/metadata/orthros-idp-metadata.xml
68+
# ADD ./orthrosstg-idp-metadata.xml /etc/shibboleth/metadata/orthrosstg-idp-metadata.xml
69+
# ADD ./sptestcgidp-metadata.xml /etc/shibboleth/metadata/sptestcgidp-metadata.xml
7070
RUN chown -R _shibd /etc/shibboleth
7171

7272
RUN rm /etc/nginx/conf.d/default.conf

‎nginx/ams/weko-frontend/app.config.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const weko = 'ams.ir.rcos.nii.ac.jp';
1+
const weko = 'mebyo.ir.rcos.nii.ac.jp';
22

33
export default defineAppConfig({
44
wekoOrigin: 'https://' + weko,
@@ -8,10 +8,10 @@ export default defineAppConfig({
88
amsApi: '/api/ams',
99
export: {
1010
jpcoar:
11-
'https://' + weko + '/oai?verb=GetRecord&metadataPrefix=jpcoar_1.0&identifier=oai:ams.ir.rcos.nii.ac.jp:',
11+
'https://' + weko + '/oai?verb=GetRecord&metadataPrefix=jpcoar_1.0&identifier=oai:mebyo.ir.rcos.nii.ac.jp:',
1212
dublincore:
13-
'https://' + weko + '/oai?verb=GetRecord&metadataPrefix=oai_dc&identifier=oai:ams.ir.rcos.nii.ac.jp:',
14-
ddi: 'https://' + weko + '/oai?verb=GetRecord&metadataPrefix=ddi&identifier=oai:ams.ir.rcos.nii.ac.jp:'
13+
'https://' + weko + '/oai?verb=GetRecord&metadataPrefix=oai_dc&identifier=oai:mebyo.ir.rcos.nii.ac.jp:',
14+
ddi: 'https://' + weko + '/oai?verb=GetRecord&metadataPrefix=ddi&identifier=oai:mebyo.ir.rcos.nii.ac.jp:'
1515
},
1616
/** RO-Crate Mapping setting */
1717
roCrate: {

‎nginx/ams/weko-frontend/nuxt.config.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export default defineNuxtConfig({
4444
},
4545
runtimeConfig: {
4646
public: {
47-
clientId: 'KVKymVW0sVb8nFSXqCgS96UjbZ9ZhreyT0Nt2VxB',
48-
redirectURI: 'https://ams.ir.rcos.nii.ac.jp/',
47+
clientId: 'kwzzqZnjLxhI7C4lTfGY4SC25SeiCf6PTVaMlOOU',
48+
redirectURI: 'https://mebyo.ir.rcos.nii.ac.jp/',
4949
apiTimeout: 10000, // api response timeout (ms)
5050
tokenRefreshLimit: 600, // refresh access token before time (s)
5151
contact: {
@@ -55,7 +55,7 @@ export default defineNuxtConfig({
5555
display: 5 // number of items displayed in DL ranking
5656
}
5757
},
58-
clientSecret: 'W3801Bel1eAz4w3RVNnCBd6mfrADfE5O2woWDhNGdFaSwKxgIo9VCUMGhMED',
58+
clientSecret: 'cTrXEd1ZaNzJNwlzRgHJdreaLV8UiHLMKLILgxAP318wz1t3TXspneL21Bgd',
5959
// email setting for contact
6060
contact: {
6161
to: 'sample@sample.co.jp',

‎nginx/orthros-idp-metadata.xml‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,2 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<EntityDescriptor entityID="https://core.orthros.gakunin.nii.ac.jp/idp" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
3-
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
4-
<Extensions>
5-
<shibmd:Scope regexp="false">openidp.nii.ac.jp</shibmd:Scope>
6-
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
7-
<mdui:DisplayName xml:lang="ja">Orthros</mdui:DisplayName>
8-
<mdui:DisplayName xml:lang="en">Orthros</mdui:DisplayName>
9-
<mdui:Description xml:lang="ja">Orthrosは、学認に参加していない機関に所属するユーザにもアカウントを発行し、連携するサービスを利用できるようにするIdPです。</mdui:Description>
10-
<mdui:Logo height="473" width="110">https://ui.orthros.gakunin.nii.ac.jp/static/user/img/Orthros_LOGO_02_color.svg</mdui:Logo>
11-
<mdui:InformationURL xml:lang="ja">https://meatwiki.nii.ac.jp/confluence/pages/viewpage.action?pageId=118168818</mdui:InformationURL>
12-
<mdui:PrivacyStatementURL xml:lang="ja">https://ui.orthros.gakunin.nii.ac.jp/ja/pages/privacy-policy</mdui:PrivacyStatementURL>
13-
<mdui:PrivacyStatementURL xml:lang="en">https://ui.orthros.gakunin.nii.ac.jp/en/pages/privacy-policy</mdui:PrivacyStatementURL>
14-
<mdui:Keywords xml:lang="en">category:location:others category:organizationType:others</mdui:Keywords>
15-
</mdui:UIInfo>
16-
</Extensions>
17-
<KeyDescriptor>
18-
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
19-
<X509Data>
20-
<X509Certificate>MIIC9zCCAd8CFExC+m7Rpuo7wwPVKMeVnE8n/fZ4MA0GCSqGSIb3DQEBCwUAMDgxCzAJBgNVBAMMAkpQMQ4wDAYDVQQIDAVUb2t5bzEZMBcGA1UEAwwQT3J0aHJvcy1JZFAtQ2VydDAeFw0yMzAzMjMwNTExMTZaFw0yODAzMjEwNTExMTZaMDgxCzAJBgNVBAMMAkpQMQ4wDAYDVQQIDAVUb2t5bzEZMBcGA1UEAwwQT3J0aHJvcy1JZFAtQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALAobQleYbpuJBB31HMkMCO4NOjfY4fDKkEpkBu+genfmJrKlTMda/ekT/eF3K73uYg5OUV1zcDXOnsM+J8RcqcLsRQAo21+3Q/95MF9B4gcFYcwDpDPVdqrwj5YvCUUfp2H45jrSRsICYYffUVsgwcSK7oUQf900imHWpKt7VimUmAgAukioQSyvV4+4RffAOUMZ6QQrhXUHcGD+uvYyiBZdx0Dr4ez7w/C632TKjzKQz6vMXHfnhIwyebcjAD3XwPj+1HfUUvdXBoLdUsMwvsNXbG1HIb6si7M+2hjf9cDhasFf/TOs0+tbWkN40aHzt7swW9z+iOmfix+eDqG04cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZhbQ3bVz7tUJ7B1POiQNklJw73bB5AWVnHDneO1Cx0vLt/6DDmmAO5HqKKUPfJeQVlABR3AGA5Ge0eEHAG/0oCjfeq2IU/ZD2lhmmZApn3TUPZB125aUQ/0uPpLVFOmAz7VMqiYVOTxkJ5GPGQ12xlkXQ4hDmkxh9Kf9LpuGj9gDiLomQOr79lduurwpZPuNjI6KyLtUhtSbWFiAznwA3KarF69HyAP0OFMUt3uTKyyH9Nu8HlHMgBOqMXaaVb39KZg2lEKltx/QBPbAp35d5QRnaLblRQgyseKmhXw+M/BM+xKAfF5q9W5NLLjm9fU19e3FlbzrLk0M0Cq5eNa8qA==</X509Certificate>
21-
</X509Data>
22-
</KeyInfo>
23-
</KeyDescriptor>
24-
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
25-
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://core.orthros.gakunin.nii.ac.jp/orthros.onmicrosoft.com/B2C_1A_USER_EXTENSION_RP_SI/samlp/sso/login" />
26-
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://core.orthros.gakunin.nii.ac.jp/orthros.onmicrosoft.com/B2C_1A_USER_EXTENSION_RP_SI/samlp/sso/login" />
27-
</IDPSSODescriptor>
28-
<Organization>
29-
<OrganizationName xml:lang="en">National Institute of Informatics</OrganizationName>
30-
<OrganizationName xml:lang="ja">国立情報学研究所</OrganizationName>
31-
<OrganizationDisplayName xml:lang="en">Orthros</OrganizationDisplayName>
32-
<OrganizationDisplayName xml:lang="ja">Orthros</OrganizationDisplayName>
33-
<OrganizationURL xml:lang="en">https://www.nii.ac.jp/</OrganizationURL>
34-
</Organization>
35-
<ContactPerson contactType="technical">
36-
<GivenName>Orthros Office</GivenName>
37-
<EmailAddress>mailto:orthros-office@nii.ac.jp</EmailAddress>
38-
</ContactPerson>
39-
</EntityDescriptor>
1+
<?xml version="1.0"?>
2+

‎nginx/orthrosstg-idp-metadata.xml‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<EntityDescriptor entityID="https://core-stg.orthros.gakunin.nii.ac.jp/idp" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
3-
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
4-
<Extensions>
5-
<shibmd:Scope regexp="false">openidp.nii.ac.jp</shibmd:Scope>
6-
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
7-
<mdui:DisplayName xml:lang="ja">Orthrosテスト環境</mdui:DisplayName>
8-
<mdui:DisplayName xml:lang="en">Orthros Test Environments</mdui:DisplayName>
9-
<mdui:Description xml:lang="ja">Orthrosは、学認に参加していない機関に所属するユーザにもアカウントを発行し、連携するサービスを利用できるようにするIdPです。</mdui:Description>
10-
<mdui:Logo height="473" width="110">https://ui-stg.orthros.gakunin.nii.ac.jp/static/user/img/Orthros_LOGO_02_color.svg</mdui:Logo>
11-
<mdui:InformationURL xml:lang="ja">https://meatwiki.nii.ac.jp/confluence/pages/viewpage.action?pageId=118168818</mdui:InformationURL>
12-
<mdui:PrivacyStatementURL xml:lang="ja">https://ui-stg.orthros.gakunin.nii.ac.jp/ja/pages/privacy-policy</mdui:PrivacyStatementURL>
13-
<mdui:PrivacyStatementURL xml:lang="en">https://ui-stg.orthros.gakunin.nii.ac.jp/en/pages/privacy-policy</mdui:PrivacyStatementURL>
14-
<mdui:Keywords xml:lang="en">category:location:others category:organizationType:others</mdui:Keywords>
15-
</mdui:UIInfo>
16-
</Extensions>
17-
<KeyDescriptor>
18-
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
19-
<X509Data>
20-
<X509Certificate>MIIC+TCCAeECFDv4A4XtSgsmbs3I/IqVeEslXYP+MA0GCSqGSIb3DQEBCwUAMDgxCzAJBgNVBAMMAkpQMQ4wDAYDVQQIDAVUb2t5bzEZMBcGA1UEAwwQT3J0aHJvcy1JZFAtQ2VydDAgFw0yMzAzMjMwNTEyMTRaGA8yMTIzMDIyNzA1MTIxNFowODELMAkGA1UEAwwCSlAxDjAMBgNVBAgMBVRva3lvMRkwFwYDVQQDDBBPcnRocm9zLUlkUC1DZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApB2B+2YahJI0/2A4XM9S1SB3jM/H+USg5udQT5DN1HawgdpvHo2o2GA1lpZlFahH4KHmlL/4UxCSBavdFfjMBclIfUnE9KHiKSXzhx4Es/HtNUBqwGWDy9JKn8zsJyWm2Qi6DpMMDFJg3e0+3xujf49aKSr7pjwfWxgtTg+mCRXr6RumdI0VZyQUTt8utHuV5xH1g+Q9XBpiYDm19CtcX8pbiG+JAadNUdByVo98oxIGhPMNz86xQq9oi6WcI9+x15CYuOAzS6DQzUdY0V4hn6Emzj4DCSQCatefsIHVIyKSpkmq0fntY3nI40m28MID60sBdVkN+ro7JVrFZsrtIQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAgMtw2D+vdfHNOhV7DG5Wzcios/6Ko8XHjXtXOzdGWYuLXaNiFi2+OWojI5mlHHo45mB1Bx3CdOl1kBW1Y8FGJqN5+Bed+5qF53FDc8H9g1LOUY1eqWajxw7bG8wqgBRI/+sx1da0f926lj9P9AvyQfHLwus1e2gwMIXBLfVIHu9WKH+Hw3QBYSCzCxWonlVbaU0wV1L7Wmm4jZoVS5+3CpIeKe1nHD1PoNa2ZzZzkNul0CL2C/Fdf95JhfffmGJwStoRf2zq3rAktWixUksqZiGJTYF+umNgG6hCPRKlXAMVTZFVMun8c8NbrFHBW6GNRDOhl8RpanECX5DyAb1bO</X509Certificate>
21-
</X509Data>
22-
</KeyInfo>
23-
</KeyDescriptor>
24-
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
25-
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://core-stg.orthros.gakunin.nii.ac.jp/orthrosstg.onmicrosoft.com/B2C_1A_USER_EXTENSION_RP_SI/samlp/sso/login" />
26-
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://core-stg.orthros.gakunin.nii.ac.jp/orthrosstg.onmicrosoft.com/B2C_1A_USER_EXTENSION_RP_SI/samlp/sso/login" />
27-
</IDPSSODescriptor>
28-
<Organization>
29-
<OrganizationName xml:lang="en">National Institute of Informatics</OrganizationName>
30-
<OrganizationName xml:lang="ja">国立情報学研究所</OrganizationName>
31-
<OrganizationDisplayName xml:lang="en">Orthros Test Environments</OrganizationDisplayName>
32-
<OrganizationDisplayName xml:lang="ja">Orthrosテスト環境</OrganizationDisplayName>
33-
<OrganizationURL xml:lang="en">https://www.nii.ac.jp/</OrganizationURL>
34-
</Organization>
35-
<ContactPerson contactType="technical">
36-
<GivenName>Orthros Office</GivenName>
37-
<EmailAddress>mailto:orthros-office@nii.ac.jp</EmailAddress>
38-
</ContactPerson>
39-
</EntityDescriptor>
1+
<?xml version="1.0"?>

‎nginx/shibboleth2.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<UnixListener address="/tmp/shibd.sock" />
66
<RequestMapper type="XML">
77
<RequestMap>
8-
<Host name="ams.ir.rcos.nii.ac.jp" authType="shibboleth" requireSession="true"
8+
<Host name="mebyo.ir.rcos.nii.ac.jp" authType="shibboleth" requireSession="true"
99
redirectToSSL="443">
1010
<Path name="/secure" />
1111
</Host>
1212
</RequestMap>
1313
</RequestMapper>
14-
<ApplicationDefaults entityID="https://ams.ir.rcos.nii.ac.jp/shibboleth-sp"
14+
<ApplicationDefaults entityID="https://mebyo.ir.rcos.nii.ac.jp/shibboleth-sp"
1515
REMOTE_USER="eppn persistent-id targeted-id"
1616
cipherSuites="DEFAULT:!EXP:!LOW:!aNULL:!eNULL:!DES:!IDEA:!SEED:!RC4:!3DES:!kRSA:!SSLv2:!SSLv3:!TLSv1:!TLSv1.1">
1717
<Sessions lifetime="28800" timeout="3600" relayState="ss:mem" checkAddress="false"

‎nginx/weko-ams.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ server {
2626
ssl_certificate /etc/nginx/server.crt;
2727
ssl_certificate_key /etc/nginx/server.key;
2828

29-
server_name ams.ir.rcos.nii.ac.jp;
29+
server_name mebyo.ir.rcos.nii.ac.jp;
3030
charset utf-8;
3131
keepalive_timeout 5;
3232

‎scripts/instance.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ WEKO_RECORDS_UI_OA_UPDATE_STATUS_URL = ""
765765
# The API URL to get OA policies. example: "<OA URL>/api/archive_policies"
766766
WEKO_RECORDS_UI_OA_GET_OA_POLICIES_URL = ""
767767

768-
SP_ENTITYID="https://ams.ir.rcos.nii.ac.jp/shibboleth-sp"
769-
WEKO_ACCOUNTS_IDP_ENTITY_ID="https://ams.ir.rcos.nii.ac.jp/shibboleth-sp"
768+
SP_ENTITYID="https://mebyo.ir.rcos.nii.ac.jp/shibboleth-sp"
769+
WEKO_ACCOUNTS_IDP_ENTITY_ID="https://mebyo.ir.rcos.nii.ac.jp/shibboleth-sp"
770770
WEKO_ACCOUNTS_SHIB_BIND_GAKUNIN_MAP_GROUPS = True
771771

0 commit comments

Comments
 (0)