Skip to content

Commit

Permalink
replace http with https (i4Ds#352)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicHoch authored Aug 30, 2023
1 parent 34bb114 commit 6203981
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/end2end_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
# Runs a set of commands using the runners shell
- name: update end2end test data
run: |
wget -qO- http://stixcore:${{ secrets.END2ENDPW }}@pub099.cs.technik.fhnw.ch/data/end2end/rebuild_hook.cgi
wget -qO- https://stixcore:${{ secrets.END2ENDPW }}@pub099.cs.technik.fhnw.ch/data/end2end/rebuild_hook.cgi
echo "git action done"
if: github.repository == 'i4Ds/STIXCore'
4 changes: 2 additions & 2 deletions docs/idb_versioning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Follow the instructions to publish a new IDB `2.26.36` version
* remove the `*.mdb` file (possible licensing conflicts)
* zip the folder structure into `v2.26.36.raw.zip`
* upload `v2.26.36.raw.zip` to `http://pub099.cs.technik.fhnw.ch/data/idb/` (`/var/www/data/idb/v2.26.36.raw.zip`)
* upload `v2.26.36.raw.zip` to `https://pub099.cs.technik.fhnw.ch/data/idb/` (`/var/www/data/idb/v2.26.36.raw.zip`)
* compile the raw IDB into a sqlite file (this will also inject some raw 2 engeneering paramaters)

.. code-block:: python
Expand All @@ -27,7 +27,7 @@ Follow the instructions to publish a new IDB `2.26.36` version
idbm.compile_version("2.26.36")
* zip the `stixcore/data/idb/v2.26.36` folder into `v2.26.36.zip`
* upload `v2.26.36.zip` to `http://pub099.cs.technik.fhnw.ch/data/idb/` (`/var/www/data/idb/v2.26.36.zip`)
* upload `v2.26.36.zip` to `https://pub099.cs.technik.fhnw.ch/data/idb/` (`/var/www/data/idb/v2.26.36.zip`)
* add a new entry to `stixcore/data/idb/idbVersionHistory.json`
* use https://pub023.cs.technik.fhnw.ch/request/time-conversion/scet2utc
* or https://pub023.cs.technik.fhnw.ch/request/time-conversion/utc2scet/2021-12-09T00:00:00
Expand Down
3 changes: 3 additions & 0 deletions stixcore/data/test/soop/LTP04_Jun2021-Sep2021.2584.all.json
Git LFS file not shown
2 changes: 1 addition & 1 deletion stixcore/data/test/stixcore.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ report_mail_receivers =
report_mail_send = False
same_esa_name_dir =
rid_lut_file = ./stixcore/data/test/publish/rid_lut.csv
rid_lut_file_update_url = http://pub099.cs.technik.fhnw.ch/publish/update_rid_lut.csv?
rid_lut_file_update_url = https://pub099.cs.technik.fhnw.ch/publish/update_rid_lut.csv?
batch_size = 20
fits_dir =
8 changes: 4 additions & 4 deletions stixcore/idb/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def find_version(self, obt=None):
return ''

def compile_version(self, version_label, force=False,
url="http://pub099.cs.technik.fhnw.ch/data/idb/"):
url="https://pub099.cs.technik.fhnw.ch/data/idb/"):
"""Download compiles and installs an IDB version of a public available URL.
Some IDB parameters will be injected to support the raw tw engineering framework.
Expand All @@ -173,7 +173,7 @@ def compile_version(self, version_label, force=False,
set to True to override the local version, by default False
url : `str`, optional
public available IDB versions folder, by default
"http://pub099.cs.technik.fhnw.ch/data/idb/"
"https://pub099.cs.technik.fhnw.ch/data/idb/"
Returns
-------
Expand Down Expand Up @@ -222,7 +222,7 @@ def compile_version(self, version_label, force=False,
return self.has_version(version_label)

def download_version(self, version_label, force=False,
url="http://pub099.cs.technik.fhnw.ch/data/idb/"):
url="https://pub099.cs.technik.fhnw.ch/data/idb/"):
"""Download and installs an IDB version of a public available URL.
Parameters
Expand All @@ -233,7 +233,7 @@ def download_version(self, version_label, force=False,
set to True to override the local version, by default False
url : `str`, optional
public available IDB versions folder, by default
"http://pub099.cs.technik.fhnw.ch/data/idb/"
"https://pub099.cs.technik.fhnw.ch/data/idb/"
Returns
-------
Expand Down
2 changes: 1 addition & 1 deletion stixcore/processing/tests/test_end2end.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def out_dir(tmpdir_factory):
def orig_data(out_dir):
orig_dir = out_dir / "origdata"
orig_dir.mkdir(parents=True, exist_ok=True)
urllib.request.urlretrieve("http://pub099.cs.technik.fhnw.ch/data/end2end/data/head.zip",
urllib.request.urlretrieve("https://pub099.cs.technik.fhnw.ch/data/end2end/data/head.zip",
orig_dir / "orig.zip")

with zipfile.ZipFile(orig_dir / "orig.zip", 'r') as zip_ref:
Expand Down
2 changes: 1 addition & 1 deletion stixcore/util/scripts/ddpd.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ def product(file_in):
"L1/2023/02/13/CAL/solo_L1_stix-cal-energy_20230213_V01.fits"
]

remote = ["http://pub099.cs.technik.fhnw.ch/data/fits/" + x for x in files]
remote = ["https://pub099.cs.technik.fhnw.ch/data/fits/" + x for x in files]
# files = ["/home/shane/fits_test/" + x for x in files]
files = [("/data/stix/out/fits_v1.0.0/" + x, remote[i]) for i, x in enumerate(files)]

Expand Down
2 changes: 1 addition & 1 deletion stixcore/util/scripts/end2end_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"L1/2021/09/20/HK/solo_L1_stix-hk-mini_20210920_V01.fits",
"L1/2021/06/28/HK/solo_L1_stix-hk-maxi_20210628_V01.fits"]

remote = ["http://pub099.cs.technik.fhnw.ch/data/fits_test/" + x for x in END_TO_END_TEST_FILES]
remote = ["https://pub099.cs.technik.fhnw.ch/data/fits_test/" + x for x in END_TO_END_TEST_FILES]
# files = ["/home/shane/fits_test/" + x for x in files]
files = [("/data/stix/end2end/fits/" + x, remote[i])
for i, x in enumerate(END_TO_END_TEST_FILES)]
Expand Down
2 changes: 1 addition & 1 deletion stixcore/util/scripts/rebuild_hook.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# it assumes that a dedicated stixcore environment is available at /data/stix/end2end/STIXCore/
#
# the final data is packed into a ZIP and copied to /data/stix/end2end/data/ what will be
# available under http://pub099.cs.technik.fhnw.ch/data/end2end/data/
# available under https://pub099.cs.technik.fhnw.ch/data/end2end/data/
#
#
################################################
Expand Down

0 comments on commit 6203981

Please sign in to comment.