Skip to content

Commit c9a9b54

Browse files
salvatorelaisoSalvatore Laiso
salvatorelaiso
and
Salvatore Laiso
authored
Remove apply_conf.sh script (#103)
* fix: remove `apply_conf.sh` script and use ENV vars instead * fix: remove `apply_conf.sh` script and use ENV vars instead * fix: delete `apply_conf.sh` file * fix: separate `SATOSA_BASE_STATIC` from `SATOSA_BASE` --------- Co-authored-by: Salvatore Laiso <[email protected]>
1 parent 9bf36a2 commit c9a9b54

File tree

12 files changed

+196
-395
lines changed

12 files changed

+196
-395
lines changed

‎Docker-compose/.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
MONGO_DBUSER=satosa
22
MONGO_DBPASSWORD=thatpassword
33
HOSTNAME=localhost
4+
KEYS_FOLDER=./pki

‎Docker-compose/docker-compose.yml

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ services:
6666
- SATOSA_BY_DOCKER=1
6767

6868
- SATOSA_BASE=https://$HOSTNAME
69+
- SATOSA_BASE_STATIC=https://$HOSTNAME/static
6970
- SATOSA_DISCO_SRV=https://$HOSTNAME/static/disco.html
7071
- SATOSA_UNKNOW_ERROR_REDIRECT_PAGE=https://$HOSTNAME/static/error_page.html
7172

@@ -74,32 +75,37 @@ services:
7475

7576
- SATOSA_CONTACT_PERSON_EMAIL_ADDRESS=support.example@organization.org
7677
- SATOSA_CONTACT_PERSON_TELEPHONE_NUMBER=+3906123456789
77-
# - SATOSA_CONTACT_PERSON_FISCALCODE=01234567890
78-
# - SATOSA_CONTACT_PERSON_GIVEN_NAME=Name
79-
# - SATOSA_ENCRYPTION_KEY=
78+
- SATOSA_CONTACT_PERSON_FISCALCODE=01234567890
79+
- SATOSA_CONTACT_PERSON_GIVEN_NAME=Name
80+
- SATOSA_CONTACT_PERSON_IPA_CODE=ispra_rm
81+
- SATOSA_CONTACT_PERSON_MUNICIPALITY=H501
82+
- SATOSA_ENCRYPTION_KEY=CHANGE_ME!
8083

81-
# - SATOSA_ORGANIZATION_DISPLAY_NAME_EN=Resource provided by Example Organization
82-
# - SATOSA_ORGANIZATION_DISPLAY_NAME_IT=Resource provided by Example Organization
83-
# - SATOSA_ORGANIZATION_NAME_EN=Resource provided by Example Organization
84-
# - SATOSA_ORGANIZATION_NAME_IT=Resource provided by Example Organization
85-
# - SATOSA_ORGANIZATION_URL_EN=https://example_organization.org
86-
# - SATOSA_ORGANIZATION_URL_IT=https://example_organization.org
87-
# - SATOSA_PRIVATE_KEY=
88-
# - SATOSA_PUBLIC_KEY=
89-
# - SATOSA_SALT=
90-
# - SATOSA_STATE_ENCRYPTION_KEY
91-
# - SATOSA_UI_DESCRIPTION_EN=Resource description
92-
# - SATOSA_UI_DESCRIPTION_IT=Resource description
93-
# - SATOSA_UI_DISPLAY_NAME_EN=Resource Display Name
94-
# - SATOSA_UI_DISPLAY_NAME_IT=Resource Display Name
95-
# - SATOSA_UI_INFORMATION_URL_EN=https://example_organization.org/information_url_en
96-
# - SATOSA_UI_INFORMATION_URL_IT=https://example_organization.org/information_url_en
97-
# - SATOSA_UI_LOGO_HEIGHT=60
98-
# - SATOSA_UI_LOGO_URL=https://example_organization.org/logo.png
99-
# - SATOSA_UI_LOGO_WIDTH=80
100-
# - SATOSA_UI_PRIVACY_URL_EN=https://example_organization.org/privacy_en
101-
# - SATOSA_UI_PRIVACY_URL_IT=https://example_organization.org/privacy_en
102-
# - SATOSA_USER_ID_HASH_SALT
84+
- SATOSA_ORGANIZATION_DISPLAY_NAME_EN=Resource provided by Example Organization
85+
- SATOSA_ORGANIZATION_DISPLAY_NAME_IT=Resource provided by Example Organization
86+
- SATOSA_ORGANIZATION_NAME_EN=Resource provided by Example Organization
87+
- SATOSA_ORGANIZATION_NAME_IT=Resource provided by Example Organization
88+
- SATOSA_ORGANIZATION_URL_EN=https://example_organization.org
89+
- SATOSA_ORGANIZATION_URL_IT=https://example_organization.org
90+
- SATOSA_PRIVATE_KEY=${KEYS_FOLDER}/privkey.pem
91+
- SATOSA_PUBLIC_KEY=${KEYS_FOLDER}/cert.pem
92+
- SATOSA_SALT=CHANGE_ME!
93+
- SATOSA_STATE_ENCRYPTION_KEY=CHANGE_ME!
94+
- SATOSA_UI_DESCRIPTION_EN=Resource description
95+
- SATOSA_UI_DESCRIPTION_IT=Resource description
96+
- SATOSA_UI_DISPLAY_NAME_EN=Resource Display Name
97+
- SATOSA_UI_DISPLAY_NAME_IT=Resource Display Name
98+
- SATOSA_UI_INFORMATION_URL_EN=https://example_organization.org/information_url_en
99+
- SATOSA_UI_INFORMATION_URL_IT=https://example_organization.org/information_url_en
100+
- SATOSA_UI_LOGO_HEIGHT=60
101+
- SATOSA_UI_LOGO_URL=https://example_organization.org/logo.png
102+
- SATOSA_UI_LOGO_WIDTH=80
103+
- SATOSA_UI_PRIVACY_URL_EN=https://example_organization.org/privacy_en
104+
- SATOSA_UI_PRIVACY_URL_IT=https://example_organization.org/privacy_en
105+
- SATOSA_USER_ID_HASH_SALT=CHANGE_ME!
106+
- SATOSA_REQUESTED_ATTRIBUTES=[]
107+
108+
- GET_IDEM_MDQ_KEY=true
103109
expose:
104110
- 10000
105111
ports:

‎example/apply_conf.sh

Lines changed: 0 additions & 176 deletions
This file was deleted.

‎example/entrypoint.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/bin/bash
22

3-
bash apply_conf.sh
3+
# get IDEM MDQ key
4+
if [[ $GET_IDEM_MDQ_KEY == true ]]; then
5+
wget https://mdx.idem.garr.it/idem-mdx-service-crt.pem -O $KEYS_FOLDER/idem-mdx-service-crt.pem
6+
wget https://registry.spid.gov.it/metadata/idp/spid-entities-idps.xml -O metadata/idp/spid-entities-idps.xml
7+
echo "Downloaded IDEM MDQ key"
8+
fi
49

510
uwsgi --ini /satosa_proxy/uwsgi_setup/uwsgi/uwsgi.ini.docker

‎example/plugins/backends/ciesaml2_backend.yaml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ config:
55
# idp_blacklist_file: /path/to/blacklist.json
66

77
# error templates
8-
static_storage_url: "https://localhost/static"
8+
static_storage_url: !ENV SATOSA_BASE_STATIC
99
error_template: "spid_login_error.html"
1010
template_folder: "templates" # project root
1111

@@ -28,33 +28,33 @@ config:
2828
# "https://identity.infocert.it": 'https://www.spid.gov.it/SpidL1'
2929

3030
sp_config:
31-
key_file: ./pki/privkey.pem
32-
cert_file: ./pki/cert.pem
31+
key_file: !ENV SATOSA_PRIVATE_KEY
32+
cert_file: !ENV SATOSA_PUBLIC_KEY
3333
encryption_keypairs:
34-
- {'key_file': ./pki/privkey.pem, 'cert_file': ./pki/cert.pem}
34+
- {'key_file': !ENV SATOSA_PRIVATE_KEY, 'cert_file': !ENV SATOSA_PUBLIC_KEY}
3535

3636
attribute_map_dir: 'attributes-map'
3737

3838
organization:
3939
display_name:
40-
- [ 'change with $SATOSA_ORGANIZATION_DISPLAY_NAME_EN', 'en']
41-
- [ 'change with $SATOSA_ORGANIZATION_DISPLAY_NAME_IT', 'it']
40+
- [ !ENV SATOSA_ORGANIZATION_DISPLAY_NAME_EN, 'en']
41+
- [ !ENV SATOSA_ORGANIZATION_DISPLAY_NAME_IT, 'it']
4242
name:
43-
- [ 'change with $SATOSA_ORGANIZATION_NAME_EN', 'en']
44-
- [ 'change with $SATOSA_ORGANIZATION_NAME_IT', 'it']
43+
- [ !ENV SATOSA_ORGANIZATION_NAME_EN, 'en']
44+
- [ !ENV SATOSA_ORGANIZATION_NAME_IT, 'it']
4545
url:
46-
- [ 'https://change_with_SATOSA_ORGANIZATION_URL_EN', 'en']
47-
- [ 'https://change_with_SATOSA_ORGANIZATION_URL_IT', 'it']
46+
- [ !ENV SATOSA_ORGANIZATION_URL_EN, 'en']
47+
- [ !ENV SATOSA_ORGANIZATION_URL_IT, 'it']
4848

4949
contact_person:
5050
- contact_type: 'administrative'
51-
company: change_with_SATOSA_ORGANIZATION_NAME_IT
52-
email_address: [email protected]
53-
telephone_number: change_with_SATOSA_CONTACT_PERSON_TELEPHONE_NUMBER
51+
company: !ENV SATOSA_ORGANIZATION_NAME_IT
52+
email_address: !ENV SATOSA_CONTACT_PERSON_EMAIL_ADDRESS
53+
telephone_number: !ENV SATOSA_CONTACT_PERSON_TELEPHONE_NUMBER
5454
cie_info:
5555
Public: ''
56-
IPACode: ispra_rm
57-
Municipality: H501
56+
IPACode: !ENV SATOSA_CONTACT_PERSON_IPA_CODE
57+
Municipality: !ENV SATOSA_CONTACT_PERSON_MUNICIPALITY
5858

5959

6060
metadata:
@@ -72,28 +72,28 @@ config:
7272
ui_info:
7373
display_name:
7474
- lang: en
75-
text: change with $SATOSA_UI_DISPLAY_NAME_EN
75+
text: !ENV SATOSA_UI_DISPLAY_NAME_EN
7676
- lang: it
77-
text: change with $SATOSA_UI_DISPLAY_NAME_IT
77+
text: !ENV SATOSA_UI_DISPLAY_NAME_IT
7878
description:
7979
- lang: en
80-
text: change with $SATOSA_UI_DESCRIPTION_EN
80+
text: !ENV SATOSA_UI_DESCRIPTION_EN
8181
- lang: it
82-
text: change with $SATOSA_UI_DESCRIPTION_IT
82+
text: !ENV SATOSA_UI_DESCRIPTION_IT
8383
information_url:
8484
- lang: en
85-
text: change with $SATOSA_UI_INFORMATION_URL_EN
86-
- lang: it
87-
text: change with $SATOSA_UI_INFORMATION_URL_IT
85+
text: !ENV SATOSA_UI_INFORMATION_URL_EN
86+
- lang: it
87+
text: !ENV SATOSA_UI_INFORMATION_URL_IT
8888
privacy_statement_url:
8989
- lang: en
90-
text: change with $SATOSA_UI_PRIVACY_URL_EN
90+
text: !ENV SATOSA_UI_PRIVACY_URL_EN
9191
- lang: it
92-
text: change with $SATOSA_UI_PRIVACY_URL_IT
92+
text: !ENV SATOSA_UI_PRIVACY_URL_IT
9393
logo:
94-
text: change with $SATOSA_UI_LOGO_URL
95-
width: change with $SATOSA_UI_LOGO_WIDTH
96-
height: change with $SATOSA_UI_LOGO_HEIGHT
94+
text: !ENV SATOSA_UI_LOGO_URL
95+
width: !ENV SATOSA_UI_LOGO_WIDTH
96+
height: !ENV SATOSA_UI_LOGO_HEIGHT
9797

9898
# sign dig and enc
9999
authn_requests_signed: true
@@ -124,7 +124,7 @@ config:
124124
'dateOfBirth',
125125
'fiscalNumber',
126126
]
127-
127+
requested_attributes: !ENV SATOSA_REQUESTED_ATTRIBUTES
128128
#optional_attributes: ['gender',
129129
# 'companyName',
130130
# 'registeredOffice',
@@ -147,4 +147,4 @@ config:
147147
- [<base_url>/<name>/disco, 'urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol']
148148

149149
# disco_srv must be defined if there is more than one IdP in the metadata specified above
150-
disco_srv: "https://sso.isprambiente.it/static/disco.html"
150+
disco_srv: !ENV SATOSA_DISCO_SRV

0 commit comments

Comments
 (0)