Ansgar pushed to branch deploy at Debian FTP Team / dak
Commits:
-
03b18e7c
by Julien Cristau at 2020-05-03T12:45:48+02:00
-
c41ea47f
by Ansgar at 2020-05-03T21:32:21+02:00
-
47f88a57
by Gunnar Wolf at 2020-05-06T12:34:45-05:00
-
2180aa82
by Ansgar at 2020-05-06T23:36:04+02:00
-
327093ef
by Ansgar at 2020-05-06T23:44:57+02:00
-
2e8fd3ca
by Ansgar at 2020-05-06T23:45:49+02:00
4 changed files:
- config/debian/apache.conf-api
- config/debian/dak.conf
- config/homedir/ssh/ftpmaster-authorized_keys
- dakweb/queries/source.py
Changes:
| ... | ... | @@ -17,6 +17,10 @@ |
| 17 | 17 |
</Directory>
|
| 18 | 18 |
WSGIDaemonProcess api.ftp-master.debian.org user=dak-web group=dak-web processes=1 threads=5
|
| 19 | 19 |
WSGIScriptAlias / /srv/ftp-master.debian.org/dak/dakweb/dakweb.wsgi
|
| 20 |
+ |
|
| 21 |
+ <IfModule mod_headers.c>
|
|
| 22 |
+ Header always add Access-Control-Allow-Origin "*"
|
|
| 23 |
+ </IfModule>
|
|
| 20 | 24 |
</Macro>
|
| 21 | 25 |
|
| 22 | 26 |
Use common-debian-service-https-redirect * api.ftp-master.debian.org
|
| ... | ... | @@ -288,7 +288,7 @@ Command::DM { |
| 288 | 288 |
|
| 289 | 289 |
Command::DM-Admin {
|
| 290 | 290 |
AdminFingerprints {
|
| 291 |
- "AB41C1C68AFD668CA045EBF8673A03E4C1DB921F"; // gwolf
|
|
| 291 |
+ "4D14050653A402D73687049D2404C9546E145360"; // gwolf
|
|
| 292 | 292 |
"A4626CBAFF376039D2D7554497BA9CE761A0963B"; // johns
|
| 293 | 293 |
"0E3A94C3E83002DAB88CCA1694FA372B2DA8B985"; // noodles
|
| 294 | 294 |
|
| ... | ... | @@ -2,13 +2,13 @@ |
| 2 | 2 |
# path: config/homedir/ssh/ftpmaster-authorized_keys
|
| 3 | 3 |
|
| 4 | 4 |
# whenever we have to read a new dataset for testing/squeeze-updates this runs
|
| 5 |
-command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh --from-ssh-command",restrict,from="5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC19ORZTjAB3fXAnUUWHVPNKVNKF+SVLGqq28M03pNkZgcAfH79q2Q/1lDOajDzxarKTxrP4wyoniiquy4PsZXrUpSyPJgnkxvlaTwDE6OupXJsaCawKcFe6eitFY9tWR2Bu71WXzjHHFI/6G9bLoiVRFAuxP/pOSJQ1doB7NEdQu8i+/hlN++0Itoa9WiHfK7PcBXjFa3eM6NqYKskxp0+cEWKV/GY51/DNp34mUO+e/ad49wz6URK8bCkdIu/ExLIAfQqLOePcSMH8XxGj6hs/Uk/CH+QzyXRZSzDU5G2QLCMN2XaoCosLzZdP7CaiWhvNth09djjPmKA8xeIZpQX release@respighi
|
|
| 5 |
+command="/srv/ftp-master.debian.org/dak/scripts/debian/import_dataset.sh --from-ssh-command",restrict,from="195.192.210.131,2a02:16a8:dc41:100::131,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC19ORZTjAB3fXAnUUWHVPNKVNKF+SVLGqq28M03pNkZgcAfH79q2Q/1lDOajDzxarKTxrP4wyoniiquy4PsZXrUpSyPJgnkxvlaTwDE6OupXJsaCawKcFe6eitFY9tWR2Bu71WXzjHHFI/6G9bLoiVRFAuxP/pOSJQ1doB7NEdQu8i+/hlN++0Itoa9WiHfK7PcBXjFa3eM6NqYKskxp0+cEWKV/GY51/DNp34mUO+e/ad49wz6URK8bCkdIu/ExLIAfQqLOePcSMH8XxGj6hs/Uk/CH+QzyXRZSzDU5G2QLCMN2XaoCosLzZdP7CaiWhvNth09djjPmKA8xeIZpQX release@respighi
|
|
| 6 | 6 |
|
| 7 | 7 |
# release team tpu removals
|
| 8 |
-command="/srv/ftp-master.debian.org/dak/scripts/debian/release_team_removals.sh",restrict,from="5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCw6DLpbCsiadOqxenRfW5In7UFG5HoIDt0xV/dRDbqNUUihNcDi6SqlREuSBCA75lOqbhL1w2tWsdsTIMnJeq3Fdr3LdFjIKlG6QQZVThaD3SI76EkGtjt0XQDoN2d4hi0Xn2LOPKz8hxaY4jKYzSUN0TVue3C1EHTJD0S8Grkd5tPaDgXt4pJzHmNwT4r2dH5OT3Y3vJL2UGhbY6Y+rNFfmnKzDcBtNdUTLTtrAfCCMkPITTYrMvZevA9u/SzNenN9qwEQicc06FrycSCi6+XSA+t4k1YNf1NTHhTQEncEX4/FRf+jgbkt1lkchiu+eShx3bUZCsKPuoNEsuWUU5v release@franck
|
|
| 8 |
+command="/srv/ftp-master.debian.org/dak/scripts/debian/release_team_removals.sh",restrict,from="195.192.210.131,2a02:16a8:dc41:100::131,respighi.debian.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCw6DLpbCsiadOqxenRfW5In7UFG5HoIDt0xV/dRDbqNUUihNcDi6SqlREuSBCA75lOqbhL1w2tWsdsTIMnJeq3Fdr3LdFjIKlG6QQZVThaD3SI76EkGtjt0XQDoN2d4hi0Xn2LOPKz8hxaY4jKYzSUN0TVue3C1EHTJD0S8Grkd5tPaDgXt4pJzHmNwT4r2dH5OT3Y3vJL2UGhbY6Y+rNFfmnKzDcBtNdUTLTtrAfCCMkPITTYrMvZevA9u/SzNenN9qwEQicc06FrycSCi6+XSA+t4k1YNf1NTHhTQEncEX4/FRf+jgbkt1lkchiu+eShx3bUZCsKPuoNEsuWUU5v release@franck
|
|
| 9 | 9 |
|
| 10 | 10 |
# release team p-u comment files
|
| 11 |
-command="/srv/ftp-master.debian.org/dak/scripts/debian/p-u-comment.sh",restrict,from="5.153.231.29,2001:41c8:1000:21::21:29,respighi.debian.org,209.87.16.72,2607:f8f0:614:1::1274:72,coccia.deban.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvamon5WR/xOOHk9T+wzwVIe5cGH90ivLg94kpFcF0Wkmp7vbh7TSdBtjy5w9YbPG4r6sAMna74dLcgPSDiEpWf56ubSDmGKgKf40EgfC7qOO31aWqRNmyuYMmxWZmbRKQ16LdajFfDEGV1Tdy1a5KdU4HgFlHoucuG7p4VHGO7ZJo0t7CQv5C/hF4gSzK+gjcI1uR1N+jUHxW+3yv75XiQpaLyWgaLYF0x4XYwcDJVcqILaySs8MllJcfyPMNvOyvrhGdHIhei8bnACOkfJ9Eeyv7tOj8Rp8ECMgzYE8AUjv5sR4zkKs7KP5MwoAuCdXvE8OMzyu4ZBa37x+yADWd release@franck
|
|
| 11 |
+command="/srv/ftp-master.debian.org/dak/scripts/debian/p-u-comment.sh",restrict,from="209.87.16.72,2607:f8f0:614:1::1274:72,coccia.deban.org" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvamon5WR/xOOHk9T+wzwVIe5cGH90ivLg94kpFcF0Wkmp7vbh7TSdBtjy5w9YbPG4r6sAMna74dLcgPSDiEpWf56ubSDmGKgKf40EgfC7qOO31aWqRNmyuYMmxWZmbRKQ16LdajFfDEGV1Tdy1a5KdU4HgFlHoucuG7p4VHGO7ZJo0t7CQv5C/hF4gSzK+gjcI1uR1N+jUHxW+3yv75XiQpaLyWgaLYF0x4XYwcDJVcqILaySs8MllJcfyPMNvOyvrhGdHIhei8bnACOkfJ9Eeyv7tOj8Rp8ECMgzYE8AUjv5sR4zkKs7KP5MwoAuCdXvE8OMzyu4ZBa37x+yADWd release@franck
|
|
| 12 | 12 |
|
| 13 | 13 |
# sync deferred queue overview
|
| 14 | 14 |
## html file
|
| ... | ... | @@ -176,6 +176,7 @@ def sources_in_suite(suite=None): |
| 176 | 176 |
|
| 177 | 177 |
s.close()
|
| 178 | 178 |
|
| 179 |
+ bottle.response.content_type = 'application/json; charset=UTF-8'
|
|
| 179 | 180 |
return json.dumps(ret)
|
| 180 | 181 |
|
| 181 | 182 |
|
| ... | ... | @@ -241,6 +242,7 @@ def source_by_metadata(key=None): |
| 241 | 242 |
'metadata_value': p.value})
|
| 242 | 243 |
s.close()
|
| 243 | 244 |
|
| 245 |
+ bottle.response.content_type = 'application/json; charset=UTF-8'
|
|
| 244 | 246 |
return json.dumps(ret)
|
| 245 | 247 |
|
| 246 | 248 |
|