Skip to content

Commit

Permalink
[email protected] -> [email protected]
Browse files Browse the repository at this point in the history
  • Loading branch information
@CannonLock
CannonLock committed Jun 2, 2023
1 parent 7b4b9c2 commit 7676829
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.client
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/centos/centos:stream8

LABEL maintainer="OSG Software <help@opensciencegrid.org>"
LABEL maintainer="OSG Software <help@osg-htc.org>"
LABEL name="OSG 3.5 OSG-Notify client"

RUN yum -y install https://repo.opensciencegrid.org/osg/3.5/osg-3.5-el8-release-latest.rpm \
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,4 @@ for the VO(s) that you support:
| LHC VOs | [GGUS](https://ggus.eu) |
| Anyone else | [Helpdesk](https://support.opensciencegrid.org) |

Or email us at help@opensciencegrid.org.
Or email us at help@osg-htc.org.
30 changes: 15 additions & 15 deletions src/app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,17 +469,17 @@ def scitokens():
return Response(origin_scitokens, mimetype="text/plain")
except ResourceNotRegistered as e:
return Response("# {}\n"
"# Please check your query or contact help@opensciencegrid.org\n"
"# Please check your query or contact help@osg-htc.org\n"
.format(str(e)),
mimetype="text/plain", status=404)
except DataError as e:
app.logger.error("{}: {}".format(request.full_path, str(e)))
return Response("# Error generating scitokens config for this FQDN: {}\n".format(str(e)) +
"# Please check configuration in OSG topology or contact help@opensciencegrid.org\n",
"# Please check configuration in OSG topology or contact help@osg-htc.org\n",
mimetype="text/plain", status=400)
except Exception:
app.log_exception(sys.exc_info())
return Response("Server error getting scitokens config, please contact help@opensciencegrid.org", status=503)
return Response("Server error getting scitokens config, please contact help@osg-htc.org", status=503)


@app.route("/osdf/namespaces")
Expand All @@ -494,17 +494,17 @@ def stashcache_namespaces_json():
mimetype='application/json')
except ResourceNotRegistered as e:
return Response("# {}\n"
"# Please check your query or contact help@opensciencegrid.org\n"
"# Please check your query or contact help@osg-htc.org\n"
.format(str(e)),
mimetype="text/plain", status=404)
except DataError as e:
app.logger.error("{}: {}".format(request.full_path, str(e)))
return Response("# Error generating namespaces json file: {}\n".format(str(e)) +
"# Please check configuration in OSG topology or contact help@opensciencegrid.org\n",
"# Please check configuration in OSG topology or contact help@osg-htc.org\n",
mimetype="text/plain", status=400)
except Exception:
app.log_exception(sys.exc_info())
return Response("Server error getting namespaces json file, please contact help@opensciencegrid.org",
return Response("Server error getting namespaces json file, please contact help@osg-htc.org",
status=503)


Expand Down Expand Up @@ -538,17 +538,17 @@ def _get_cache_authfile(public_only):
suppress_errors=False)
except (ResourceNotRegistered, ResourceMissingService) as e:
return Response("# {}\n"
"# Please check your query or contact help@opensciencegrid.org\n"
"# Please check your query or contact help@osg-htc.org\n"
.format(str(e)),
mimetype="text/plain", status=404)
except DataError as e:
app.logger.error("{}: {}".format(request.full_path, str(e)))
return Response("# Error generating authfile for this FQDN: {}\n".format(str(e)) +
"# Please check configuration in OSG topology or contact help@opensciencegrid.org\n",
"# Please check configuration in OSG topology or contact help@osg-htc.org\n",
mimetype="text/plain", status=400)
except Exception:
app.log_exception(sys.exc_info())
return Response("Server error getting authfile, please contact help@opensciencegrid.org", status=503)
return Response("Server error getting authfile, please contact help@osg-htc.org", status=503)
return Response(auth, mimetype="text/plain")


Expand All @@ -562,17 +562,17 @@ def _get_origin_authfile(public_only):
suppress_errors=False, public_origin=public_only)
except (ResourceNotRegistered, ResourceMissingService) as e:
return Response("# {}\n"
"# Please check your query or contact help@opensciencegrid.org\n"
"# Please check your query or contact help@osg-htc.org\n"
.format(str(e)),
mimetype="text/plain", status=404)
except DataError as e:
app.logger.error("{}: {}".format(request.full_path, str(e)))
return Response("# Error generating authfile for this FQDN: {}\n".format(str(e)) +
"# Please check configuration in OSG topology or contact help@opensciencegrid.org\n",
"# Please check configuration in OSG topology or contact help@osg-htc.org\n",
mimetype="text/plain", status=400)
except Exception:
app.log_exception(sys.exc_info())
return Response("Server error getting authfile, please contact help@opensciencegrid.org", status=503)
return Response("Server error getting authfile, please contact help@osg-htc.org", status=503)
return Response(auth, mimetype="text/plain")


Expand All @@ -590,17 +590,17 @@ def _get_scitoken_file(fqdn, get_scitoken_function):

except ResourceNotRegistered as e:
return Response("# {}\n"
"# Please check your query or contact help@opensciencegrid.org\n"
"# Please check your query or contact help@osg-htc.org\n"
.format(str(e)),
mimetype="text/plain", status=404)
except DataError as e:
app.logger.error("{}: {}".format(request.full_path, str(e)))
return Response("# Error generating scitokens config for this FQDN: {}\n".format(str(e)) +
"# Please check configuration in OSG topology or contact help@opensciencegrid.org\n",
"# Please check configuration in OSG topology or contact help@osg-htc.org\n",
mimetype="text/plain", status=400)
except Exception:
app.log_exception(sys.exc_info())
return Response("Server error getting scitokens config, please contact help@opensciencegrid.org", status=503)
return Response("Server error getting scitokens config, please contact help@osg-htc.org", status=503)


def _get_cache_scitoken_file():
Expand Down
6 changes: 3 additions & 3 deletions src/templates/contacts.html.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ OSG Contacts
{% endif %}
<div class="alert alert-info" role="alert">
Profile information is provided by the user and may be out of date.
To update your information, please contact <a href="mailto:help@opensciencegrid.org">help@opensciencegrid.org</a>.
To update your information, please contact <a href="mailto:help@osg-htc.org">help@osg-htc.org</a>.
</div>
</div>
<div class="container">
Expand All @@ -34,7 +34,7 @@ OSG Contacts
{{ user.Profile|replace("\n", "<br>") }}
<br>
{%- else -%}
<span class="text-danger" data-toggle="tooltip" title="Mail help@opensciencegrid.org to update">(no profile)</span>
<span class="text-danger" data-toggle="tooltip" title="Mail help@osg-htc.org to update">(no profile)</span>
{%- endif %}
</p>
</div>
Expand All @@ -44,7 +44,7 @@ OSG Contacts
{% if user.GitHub -%}
<a href="https://github.com/{{user.GitHub}}">{{ user.GitHub }}</a>
{%- else -%}
<span class="text-danger" data-toggle="tooltip" title="Mail help@opensciencegrid.org to register">(none)</span>
<span class="text-danger" data-toggle="tooltip" title="Mail help@osg-htc.org to register">(none)</span>
{%- endif %}
</div>
</div>
Expand Down

0 comments on commit 7676829

Please sign in to comment.