Skip to content

Commit c2d2dec

Browse files
tcmitchelltcmitchell
committed
Merge branch 'develop' into transition
2 parents a5fa34e + 8c3ad4a commit c2d2dec

File tree

243 files changed

+3082
-3697
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+3082
-3697
lines changed

‎CHANGES.md

+44
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,53 @@
11
# GENI Portal Release Notes
22

3+
# [Release 3.11](https://github.com/GENI-NSF/geni-portal/milestones/3.11)
4+
5+
6+
# [Release 3.10](https://github.com/GENI-NSF/geni-portal/milestones/3.10)
7+
8+
* Show open project lead requests on profile
9+
([#1424](https://github.com/GENI-NSF/geni-portal/issues/1424))
10+
* Remove project lead checkbox from modify page for project leads
11+
([#1431](https://github.com/GENI-NSF/geni-portal/issues/1431))
12+
* Fix PHP warning on admin page
13+
([#1430](https://github.com/GENI-NSF/geni-portal/issues/1430))
14+
* Fix bug where log and map tabs wouldn't show up if table view
15+
was preffered view on the dashboard.
16+
([#1653](https://github.com/GENI-NSF/geni-portal/issues/1653))
17+
* Confine jFed launch to a single page
18+
([#1663](https://github.com/GENI-NSF/geni-portal/issues/1663))
19+
20+
# [Release 3.9](https://github.com/GENI-NSF/geni-portal/milestones/3.9)
21+
22+
* Add salist.json for xml-signer tool
23+
([#1268](https://github.com/GENI-NSF/geni-portal/issues/1268))
24+
* Add "New Project" button to project table view.
25+
([#1650](https://github.com/GENI-NSF/geni-portal/issues/1650))
26+
* Make project table view show expired projects.
27+
([#1651](https://github.com/GENI-NSF/geni-portal/issues/1651))
28+
29+
# [Release 3.8](https://github.com/GENI-NSF/geni-portal/milestones/3.8)
30+
31+
* Join this project must correctly check return indicating
32+
an existing request to join this project.
33+
([#1637](https://github.com/GENI-NSF/geni-portal/issues/1637))
34+
* `get_project` uses wrong variable name for result. `lookup_project_details`
35+
should bail when given empty list of projet UIDs.
36+
([#1639](https://github.com/GENI-NSF/geni-portal/issues/1639))
37+
* Support properly importing the `lead_request` table into a new database.
38+
([#1643](https://github.com/GENI-NSF/geni-portal/issues/1643))
39+
* Skip re-generating user certs on DB import by default.
40+
Use `--regen_certs` for old behavior.
41+
([#1644](https://github.com/GENI-NSF/geni-portal/issues/1644))
42+
343
# [Release 3.7](https://github.com/GENI-NSF/geni-portal/milestones/3.7)
444

545
* "Add Global Node" gets "URI too long" for large topology
646
([#1622](https://github.com/GENI-NSF/geni-portal/issues/1622))
47+
* Force aggregate status page in a tab
48+
([#1624](https://github.com/GENI-NSF/geni-portal/issues/1624))
49+
* Add an ansible inventory to the details page
50+
([#1630](https://github.com/GENI-NSF/geni-portal/issues/1630))
751

852
# [Release 3.6](https://github.com/GENI-NSF/geni-portal/milestones/3.6)
953

‎LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2010-2015 Raytheon BBN Technologies
1+
Copyright (c) 2010-2016 Raytheon BBN Technologies
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and/or hardware specification (the "Work") to

‎bin/geni-export-rspecs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- mode:python -*-
33

44
#----------------------------------------------------------------------
5-
# Copyright (c) 2013-2015 Raytheon BBN Technologies
5+
# Copyright (c) 2013-2016 Raytheon BBN Technologies
66
#
77
# Permission is hereby granted, free of charge, to any person obtaining
88
# a copy of this software and/or hardware specification (the "Work") to

‎bin/geni-get-ad-rspecs.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- Mode: python -*-
33
#
44
#----------------------------------------------------------------------
5-
# Copyright (c) 2014-2015 Raytheon BBN Technologies
5+
# Copyright (c) 2014-2016 Raytheon BBN Technologies
66
#
77
# Permission is hereby granted, free of charge, to any person obtaining
88
# a copy of this software and/or hardware specification (the "Work") to

‎bin/geni-manage-maintenance

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- Mode: python -*-
33
#
44
#----------------------------------------------------------------------
5-
# Copyright (c) 2013-2015 Raytheon BBN Technologies
5+
# Copyright (c) 2013-2016 Raytheon BBN Technologies
66
#
77
# Permission is hereby granted, free of charge, to any person obtaining
88
# a copy of this software and/or hardware specification (the "Work") to

‎bin/geni-parse-map-data

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- Mode: python -*-
33
#
44
#----------------------------------------------------------------------
5-
# Copyright (c) 2014-2015 Raytheon BBN Technologies
5+
# Copyright (c) 2014-2016 Raytheon BBN Technologies
66
#
77
# Permission is hereby granted, free of charge, to any person obtaining
88
# a copy of this software and/or hardware specification (the "Work") to

‎bin/geni-sync-wireless

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- Mode: python -*-
33
#
44
#----------------------------------------------------------------------
5-
# Copyright (c) 2015 Raytheon BBN Technologies
5+
# Copyright (c) 2015-2016 Raytheon BBN Technologies
66
#
77
# Permission is hereby granted, free of charge, to any person obtaining
88
# a copy of this software and/or hardware specification (the "Work") to

‎bin/portal_utils/orbit_interface.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- Mode: python -*-
33
#
44
#----------------------------------------------------------------------
5-
# Copyright (c) 2015 Raytheon BBN Technologies
5+
# Copyright (c) 2015-2016 Raytheon BBN Technologies
66
#
77
# Permission is hereby granted, free of charge, to any person obtaining
88
# a copy of this software and/or hardware specification (the "Work") to

‎ch/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ nobase_dist_svcdata_DATA = \
44
apache2.conf \
55
www/index.html \
66
www/favicon.ico \
7-
www/cainfo.html
7+
www/cainfo.html \
8+
www/salist.json

‎ch/www/salist.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"identity-providers":
3+
[
4+
{
5+
"name": "Utah Emulab",
6+
"urn": "urn:publicid:IDN+emulab.net+authority+sa",
7+
"pg-sa-url": "https://www.emulab.net:12369/protogeni/xmlrpc/sa",
8+
"web-cert-url": "https://www.emulab.net/getsslcertjs.php3",
9+
"icon": "https://www.emulab.net/protogeni/boot/utah-logo.gif"
10+
},
11+
{
12+
"name": "GENI Clearinghouse",
13+
"urn": "urn:publicid:IDN+ch.geni.net+authority+sa",
14+
"pg-sa-url": "https://ch.geni.net:443/PGCH",
15+
"web-cert-url": "https://portal.geni.net/secure/loadcert.php"
16+
}
17+
]
18+
}

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([geni-ch], [3.7], [[email protected]])
1+
AC_INIT([geni-ch], [3.11], [[email protected]])
22
#AM_INIT_AUTOMAKE([foreign -Wall -Werror])
33
#AM_INIT_AUTOMAKE([foreign -Wall])
44
AM_INIT_AUTOMAKE([foreign -Wall -Wno-portability])

‎doc/geni-portal.texi

+49-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@syncodeindex pg cp
1111

1212
@copying
13-
Copyright @copyright{} 2015 Raytheon BBN Technologies
13+
Copyright @copyright{} 2015-2016 Raytheon BBN Technologies
1414

1515
Permission is hereby granted, free of charge, to any person obtaining
1616
a copy of this software and/or hardware specification (the "Work") to
@@ -304,6 +304,54 @@ geni-disable-user -k <private key> -c <certificate> \
304304
-u https://ch.geni.net -m <username>
305305
@end example
306306

307+
@section Reset an iRODS password
308+
@cindex iRODS
309+
310+
If a user forgets their iRODS password they have no way of resetting it
311+
through the iRODS user interface. An Operator can manually reset their
312+
password using the iRODS command line tools. Once the password is reset
313+
they can log in to iRODS and change it themselves.
314+
315+
The first step is to determine the GENI username of the individual
316+
whose password needs recovering. You may be able to get this from the
317+
Admin interface on the portal, by asking them, or by searching the
318+
iRODS related messages in @code{portal_error.log}.
319+
320+
Next, download and install the iRODS ``icommands'' package. There are ready
321+
built packages available for CentOS 7, so that is the easiest path. Downloads
322+
are available from @code{https://irods.org/download/}. As of this writing
323+
the current version of icommands is 4.1.7. To install this package on CentOS
324+
7:
325+
326+
@example
327+
sudo yum install -y epel-release
328+
sudo yum localinstall irods-icommands-4.1.7-centos7-x86_64.rpm
329+
@end example
330+
331+
Now run @code{iinit} to initialize the settings. The values required are as
332+
follows:
333+
334+
@example
335+
Host name: geni-gimi.renci.org
336+
Port number: 1247
337+
irods user name: rods
338+
irods zone: geniRenci
339+
password: @emph{see /etc/geni-ch/settings.php}
340+
@end example
341+
342+
Now you can run @code{iadmin} to enter the admin interface.
343+
344+
@itemize @bullet
345+
@item Try @code{help} to see available commands
346+
@item To remove a user: @code{rm user geni-<username>}
347+
@item To change a user's password:
348+
@code{moduser geni-<username> password <new password>}
349+
@end itemize
350+
351+
User's can change their password in two ways, either by command line or
352+
web UI. Refer them to @code{http://groups.geni.net/geni/wiki/HowToUseiRODS}
353+
for information.
354+
307355

308356
@node System Administration
309357
@chapter System Administration

‎etc/example-settings.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
//----------------------------------------------------------------------
3-
// Copyright (c) 2012-2015 Raytheon BBN Technologies
3+
// Copyright (c) 2012-2016 Raytheon BBN Technologies
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining
66
// a copy of this software and/or hardware specification (the "Work") to

0 commit comments

Comments
 (0)