diff --git a/rpm/teapot-rpm-alma.sh b/rpm/teapot-rpm-alma.sh index 88049b8..2601f60 100755 --- a/rpm/teapot-rpm-alma.sh +++ b/rpm/teapot-rpm-alma.sh @@ -14,7 +14,8 @@ rm -r teapot-"$version_rpm" mv teapot-"$version_rpm".tar.gz "$HOME"/rpmbuild/SOURCES/ #getting the storm-webdav.jar file -curl -O https://repo.cloud.cnaf.infn.it/repository/storm-rpm-stable/centos7/storm-webdav-1.4.2-1.el7.noarch.rpm +#curl -O https://repo.cloud.cnaf.infn.it/repository/storm-rpm-stable/centos7/storm-webdav-1.4.2-1.el7.noarch.rpm +curl -O https://syncandshare.desy.de/index.php/s/GwSKbqF8DQZ4KzG/download/storm-webdav-1.4.2-1.el7.noarch.rpm rpm2cpio storm-webdav-1.4.2-1.el7.noarch.rpm | cpio -id ./usr/share/java/storm-webdav/storm-webdav-server.jar rm storm-webdav-1.4.2-1.el7.noarch.rpm mv usr/share/java/storm-webdav/storm-webdav-server.jar ./ diff --git a/rpm/teapot-rpm-rocky.sh b/rpm/teapot-rpm-rocky.sh index 801844e..e004cd2 100755 --- a/rpm/teapot-rpm-rocky.sh +++ b/rpm/teapot-rpm-rocky.sh @@ -14,7 +14,8 @@ rm -r teapot-"$version_rpm" mv teapot-"$version_rpm".tar.gz "$HOME"/rpmbuild/SOURCES/ #getting the storm-webdav.jar file -curl -O https://repo.cloud.cnaf.infn.it/repository/storm-rpm-stable/centos7/storm-webdav-1.4.2-1.el7.noarch.rpm +#curl -O https://repo.cloud.cnaf.infn.it/repository/storm-rpm-stable/centos7/storm-webdav-1.4.2-1.el7.noarch.rpm +curl -O https://syncandshare.desy.de/index.php/s/GwSKbqF8DQZ4KzG/download/storm-webdav-1.4.2-1.el7.noarch.rpm rpm2cpio storm-webdav-1.4.2-1.el7.noarch.rpm | cpio -id ./usr/share/java/storm-webdav/storm-webdav-server.jar rm storm-webdav-1.4.2-1.el7.noarch.rpm mv usr/share/java/storm-webdav/storm-webdav-server.jar ./ diff --git a/teapot.py b/teapot.py index 517ff04..eeb4a08 100644 --- a/teapot.py +++ b/teapot.py @@ -831,7 +831,11 @@ async def _return_or_create_storm_instance(sub): cafile=config["Storm-webdav"]["Storm-webdav_CA"] ) resp = httpx.get( - "https://"+{config["Storm-webdav"]["SERVER_ADDRESS"]}+":"+port+"/", + "https://" + + config["Storm-webdav"]["SERVER_ADDRESS"] + + ":" + + port + + "/", verify=context1 ) if resp.status_code >= 200: @@ -949,7 +953,13 @@ def main(): cert = config["Teapot"]["Teapot_ssl_certificate"] key = config["Teapot"]["Teapot_ssl_key"] - uvicorn.run(app, host=config["Teapot"]["hostname"], port=config["Teapot"]["port"], ssl_keyfile=key, ssl_certfile=cert) + uvicorn.run( + app, + host=config["Teapot"]["hostname"], + port=config.getint("Teapot", "port"), + ssl_keyfile=key, + ssl_certfile=cert + ) if __name__ == "__main__":