Skip to content

Commit 136ad21

Browse files
committed
Convert most links from http: to https:
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 06c84f6 commit 136ad21

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

check_dns.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def check_dns():
5656
sitestatus = wordpress
5757
elif e.code == 404:
5858
sitestatus = (
59-
"There doesn't seem to be any content currently at %s; make sure that directory exists and has an index.html, index.cgi, or similar, or change this hostname to point somewhere else at http://pony.scripts.mit.edu."
59+
"There doesn't seem to be any content currently at %s; make sure that directory exists and has an index.html, index.cgi, or similar, or change this hostname to point somewhere else at https://pony.scripts.mit.edu."
6060
% path
6161
)
6262
elif e.code == 403:
@@ -82,7 +82,7 @@ def check_dns():
8282
Let us know if you run into any issues.
8383
8484
~The SIPB Scripts Team
85-
http://scripts.mit.edu/
85+
https://scripts.mit.edu/
8686
8787
/set status=resolved
8888
""" % dict(

scripts/auth.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def validate_locker(locker, team_ok=False, sudo_ok=False):
9393
except KeyError:
9494
raise AuthError(
9595
html(
96-
"""The '%s' locker is not signed up for scripts.mit.edu; <a href="http://scripts.mit.edu/web/">sign it up</a> first."""
96+
"""The '%s' locker is not signed up for scripts.mit.edu; <a href="https://scripts.mit.edu/web/">sign it up</a> first."""
9797
% cgi.escape(locker)
9898
)
9999
)
@@ -103,7 +103,7 @@ def validate_locker(locker, team_ok=False, sudo_ok=False):
103103
and not can_admin(locker)
104104
):
105105
raise AuthError(
106-
"You cannot administer the '%s' locker! Please see http://scripts.mit.edu/faq/159 for more details."
106+
"You cannot administer the '%s' locker! Please see https://scripts.mit.edu/faq/159 for more details."
107107
% locker
108108
)
109109

scripts/templates/master.mak

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ else:
106106
white-space: nowrap;
107107
}
108108

109-
/* FFS firefox http://stackoverflow.com/questions/8859908/buttons-too-tall-on-firefox */
109+
/* FFS firefox https://stackoverflow.com/questions/8859908/buttons-too-tall-on-firefox */
110110
/* (normalize.css contains this line so it's probably reasonable) */
111111
input::-moz-focus-inner, button::-moz-focus-inner {
112112
border: 0;
@@ -163,7 +163,7 @@ else:
163163
%if auth.on_scripts_team():
164164
<li><a href="${tg.url('/queue')}"><span class="fa fa-th-list"></span> Admin Queue</a></li>
165165
%endif
166-
<li><a href="http://scripts.mit.edu/"><span class="fa fa-home"></span> scripts.mit.edu home</a></li>
166+
<li><a href="https://scripts.mit.edu/"><span class="fa fa-home"></span> scripts.mit.edu home</a></li>
167167
</ul>
168168

169169
</div>
@@ -186,7 +186,7 @@ tg_flash = tg.flash_obj.render('flash', use_js=False)
186186

187187
<p>&nbsp;</p>
188188

189-
<center><small>&copy; 2009-${datetime.now().year}, the SIPB scripts.mit.edu project.<br/>These pages may be reused under either the <a href="/nolink/81/">GFDL 1.2</a> or <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">CC-BY-SA 3.0</a>.<br/>Questions? Contact <a href="mailto:[email protected]">[email protected]</a>.<br/><br/>
189+
<center><small>&copy; 2009-${datetime.now().year}, the SIPB scripts.mit.edu project.<br/>These pages may be reused under either the <a href="/nolink/81/">GFDL 1.2</a> or <a rel="license" href="https://creativecommons.org/licenses/by-sa/3.0/us/">CC-BY-SA 3.0</a>.<br/>Questions? Contact <a href="mailto:[email protected]">[email protected]</a>.<br/><br/>
190190

191191
You are currently connected to ${scriptshost}.</small></center>
192192

@@ -199,7 +199,7 @@ Feel free to contact us with any questions, comments, or suggestions.
199199
<ul><li><a href="mailto:[email protected]"><span class="fa fa-envelope"></span> [email protected]</a></li>
200200
</ul>
201201

202-
<a class="nobutt" href="http://scripts.mit.edu/faq/45/"><img src="${tg.url('/scripts/media/powered_by-trans.gif')}" alt="powered by scripts.mit.edu"/></a>
202+
<a class="nobutt" href="https://scripts.mit.edu/faq/45/"><img src="${tg.url('/scripts/media/powered_by-trans.gif')}" alt="powered by scripts.mit.edu"/></a>
203203

204204
</div>
205205
<center><a href="${tg.url('/pony')}" style="color:white">(and ponies)</a></center>

scriptspony/controllers/root.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def reject(self, id, subject=None, body=None, token=None, silent=False):
360360
subject="Re: Request for hostname %s" % t.hostname,
361361
body="""Hello,
362362
363-
Unfortunately, the hostname %(hostname)s is not available. You can go to http://pony.scripts.mit.edu/ to request a different one.
363+
Unfortunately, the hostname %(hostname)s is not available. You can go to https://pony.scripts.mit.edu/ to request a different one.
364364
365365
Sorry for the inconvenience,
366366
-%(first)s

scriptspony/templates/index.mak

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ from scripts import auth
3737

3838
Paths are relative to the top directory for the
3939
appropriate service; for example,
40-
<tt>/mit/${locker}/web_scripts/</tt> for <a href="http://scripts.mit.edu/web/">web scripts</a> or
41-
<tt>/mit/${locker}/Scripts/svn/</tt> for <a href="http://scripts.mit.edu/faq/93/">Subversion</a>.
40+
<tt>/mit/${locker}/web_scripts/</tt> for <a href="https://scripts.mit.edu/web/">web scripts</a> or
41+
<tt>/mit/${locker}/Scripts/svn/</tt> for <a href="https://scripts.mit.edu/faq/93/">Subversion</a>.
4242
</p>
4343
<p>
4444
<a href="${tg.url('/new/'+locker)}" class="btn"><span class="fa fa-plus"></span> Request a new hostname</a> for the ${locker} locker
@@ -71,13 +71,13 @@ from scripts import auth
7171
%elif https:
7272
<p>You don't seem to be presenting a valid certificate. You may
7373
wish to consult
74-
the <a href="http://ist.mit.edu/services/certificates/wizard">IS&amp;T
74+
the <a href="https://ist.mit.edu/services/certificates/wizard">IS&amp;T
7575
Certificate Help Wizard</a>.</p>
7676
%else:
7777
<p>
7878
Welcome to the scripts.mit.edu hostname management tool. You can
7979
request short hostnames to refer to your
80-
<a href="http://scripts.mit.edu/">scripts.mit.edu</a> pages and
80+
<a href="https://scripts.mit.edu/">scripts.mit.edu</a> pages and
8181
configure the hostnames you already have. Log in with your MIT
8282
certificates above.
8383
</p>

scriptspony/templates/new.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ from scripts.auth import token
1313
to force-submit a request! Only do this in response to a user request!
1414
Be careful!</p>
1515
%endif
16-
<p>You about to request a hostname for the <b>${locker}</b> locker. If you purchased a domain and want to associate it with Scripts, your request will be automatically approved. <a href="http://scripts.mit.edu/faq/14/do-cnames-work-with-the-script-service">Our FAQ has details on the process</a>.</p>
16+
<p>You about to request a hostname for the <b>${locker}</b> locker. If you purchased a domain and want to associate it with Scripts, your request will be automatically approved. <a href="https://scripts.mit.edu/faq/14/do-cnames-work-with-the-script-service">Our FAQ has details on the process</a>.</p>
1717
<p>Requests for hostnames ending in ".${locker}.scripts.mit.edu" will also be automatically approved.</p>
1818
<p>If you want a different hostname ending in ".mit.edu", this will require approval by the Scripts team, get forwarded to IS&T for processing, and then become active after a few business days.</p>
1919
<ul class="form">

scriptspony/vhosts.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ def validate_hostname(hostname, locker):
348348
if status.status != httplib.OK:
349349
raise UserError(
350350
auth.html(
351-
"'%s' does not point at scripts-vhosts. If you want to continue anyway, please create a file called '%s' in the root directory of the site. See <a href='http://scripts.mit.edu/faq/132/can-i-add-a-vhost-before-i-point-my-domain-at-scripts' target='_blank'>the FAQ</a> for more information."
351+
"'%s' does not point at scripts-vhosts. If you want to continue anyway, please create a file called '%s' in the root directory of the site. See <a href='https://scripts.mit.edu/faq/132/can-i-add-a-vhost-before-i-point-my-domain-at-scripts' target='_blank'>the FAQ</a> for more information."
352352
% (cgi.escape(hostname), cgi.escape(check_file))
353353
)
354354
)
@@ -357,7 +357,7 @@ def validate_hostname(hostname, locker):
357357
except (httplib.HTTPException, socket.error):
358358
raise UserError(
359359
auth.html(
360-
"'%s' does not point at scripts-vhosts, and appears to have no running webserver. Please see <a href='http://scripts.mit.edu/faq/132/can-i-add-a-vhost-before-i-point-my-domain-at-scripts' target='_blank'>the FAQ</a> for more information."
360+
"'%s' does not point at scripts-vhosts, and appears to have no running webserver. Please see <a href='https://scripts.mit.edu/faq/132/can-i-add-a-vhost-before-i-point-my-domain-at-scripts' target='_blank'>the FAQ</a> for more information."
361361
% cgi.escape(hostname)
362362
)
363363
)

0 commit comments

Comments
 (0)