Skip to content

Commit 88efbf9

Browse files
ahelsingahelsing
committed
ticket GENI-NSF#898: remove a few more controller vestiges
1 parent c7f6d5a commit 88efbf9

16 files changed

+27
-837
lines changed

‎INSTALL

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@ configuring the database (PostgreSQL).
2525
Add the following lines to /etc/apache2/sites-available/default-ssl:
2626

2727
Include /usr/share/geni-ch/portal/apache2.conf
28-
Include /usr/share/geni-ch/sa/apache2.conf
2928

3029
6. Restart Apache.
3130

3231
/usr/bin/sudo /usr/sbin/service apache2 restart
3332

34-
7. Test the slice authority. From the proto-ch/sa directory, run the
33+
FIXME OBE 7. Test the slice authority. From the proto-ch/sa directory, run the
3534
following command:
3635

37-
curl -k -T sample.msg https://host.example.com/sa/sa_controller.php
36+
curl -k -T sample.msg https://host.example.com/SA
3837

3938
That should output "created my slice 2" if everything is working
4039
properly. If no output is shown, look in

‎etc/ch-services.ini.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -55,32 +55,32 @@ key=%(datadir)s/sr/sr-key.pem
5555
cert=%(datadir)s/sa/sa-cert.pem
5656
key=%(datadir)s/sa/sa-key.pem
5757
ca=yes
58-
url=https://%(servicehost)s/sa/sa_controller.php
58+
url=https://%(servicehost)s/SA
5959
type=1
6060

6161
[pa]
62-
cert=%(datadir)s/pa/pa-cert.pem
63-
key=%(datadir)s/pa/pa-key.pem
64-
url=https://%(servicehost)s/pa/pa_controller.php
62+
cert=%(datadir)s/sa/sa-cert.pem
63+
key=%(datadir)s/sa/sa-key.pem
64+
url=https://%(servicehost)s/SA
6565
type=2
6666

6767
[ma]
6868
cert=%(datadir)s/ma/ma-cert.pem
6969
key=%(datadir)s/ma/ma-key.pem
7070
ca=yes
71-
url=https://%(servicehost)s/ma/ma_controller.php
71+
url=https://%(servicehost)s/MA
7272
type=3
7373

7474
[logging]
7575
cert=%(datadir)s/logging/logging-cert.pem
7676
key=%(datadir)s/logging/logging-key.pem
77-
url=https://%(servicehost)s/logging/logging_controller.php
77+
url=https://%(servicehost)s/LOG
7878
type=5
7979

8080
[cs]
8181
cert=%(datadir)s/cs/cs-cert.pem
8282
key=%(datadir)s/cs/cs-key.pem
83-
url=https://%(servicehost)s/cs/cs_controller.php
83+
url=https://%(servicehost)s/CS
8484
type=6
8585

8686
[km]

‎etc/example-services.ini.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -55,32 +55,32 @@ key=%(datadir)s/sr/sr-key.pem
5555
cert=%(datadir)s/sa/sa-cert.pem
5656
key=%(datadir)s/sa/sa-key.pem
5757
ca=yes
58-
url=https://%(servicehost)s/sa/sa_controller.php
58+
url=https://%(servicehost)s/SA
5959
type=1
6060

6161
[pa]
62-
cert=%(datadir)s/pa/pa-cert.pem
63-
key=%(datadir)s/pa/pa-key.pem
64-
url=https://%(servicehost)s/pa/pa_controller.php
62+
cert=%(datadir)s/sa/sa-cert.pem
63+
key=%(datadir)s/sa/sa-key.pem
64+
url=https://%(servicehost)s/SA
6565
type=2
6666

6767
[ma]
6868
cert=%(datadir)s/ma/ma-cert.pem
6969
key=%(datadir)s/ma/ma-key.pem
7070
ca=yes
71-
url=https://%(servicehost)s/ma/ma_controller.php
71+
url=https://%(servicehost)s/MA
7272
type=3
7373

7474
[logging]
7575
cert=%(datadir)s/logging/logging-cert.pem
7676
key=%(datadir)s/logging/logging-key.pem
77-
url=https://%(servicehost)s/logging/logging_controller.php
77+
url=https://%(servicehost)s/LOG
7878
type=5
7979

8080
[cs]
8181
cert=%(datadir)s/cs/cs-cert.pem
8282
key=%(datadir)s/cs/cs-key.pem
83-
url=https://%(servicehost)s/cs/cs_controller.php
83+
url=https://%(servicehost)s/CS
8484
type=6
8585

8686
[km]

‎etc/example-settings.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* Bootstrap the service registry. All other services are discovered
4141
* via the service registry.
4242
*/
43-
$service_registry_url = 'https://ch.example.com/sr/sr_controller.php';
43+
$service_registry_url = 'https://ch.example.com:8444/SR';
4444

4545
/*
4646
* User/PW for an admin account on the iRODS Test server for use by

‎install-ch.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ if [ "${INSTALL_CONFIG_FILES}" = "yes" ]; then
113113

114114
sudo sed -i -e "/^\$db_dsn =/s/=.*/= 'pgsql:\/\/portal:$PORTAL_PASSWORD@localhost\/portal';/" /etc/geni-ch/settings.php
115115
sudo sed -i -e "/^\$portal_admin_email =/s/=.*/= '$CH_EMAIL';/" /etc/geni-ch/settings.php
116-
sudo sed -i -e "/^\$service_registry_url =/s/=.*/= 'https:\/\/$CH_HOST\/sr\/sr_controller.php';/" /etc/geni-ch/settings.php
116+
sudo sed -i -e "/^\$service_registry_url =/s/=.*/= 'https:\/\/$CH_HOST\:8444/SR';/" /etc/geni-ch/settings.php
117117
else
118118
test -f /etc/geni-ch/settings.php
119119
fi

‎lib/php/sr_constants.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function get_sr_url()
113113
} else {
114114
/* If no setting above, assume this host as SR. */
115115
$http_host = $_SERVER['SERVER_NAME'];
116-
$sr_url = "https://" . $http_host . ":8001/CH";
116+
$sr_url = "https://" . $http_host . ":8444/SR";
117117
return $sr_url;
118118
}
119119
}
@@ -126,4 +126,4 @@ class SR_XMLRPC_API {
126126
}
127127

128128

129-
?>
129+
?>

‎portal/Makefile.am

-7
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ dist_svcweb_DATA = \
6666
www/portal/confirm-sliverdelete.php \
6767
www/portal/createslice.php \
6868
www/portal/createsliver.php \
69-
www/portal/cs_controller_test.php \
7069
www/portal/db-util.php \
7170
www/portal/db_error_test.php \
72-
www/portal/debug.php \
7371
www/portal/debug_clearcache.php \
7472
www/portal/deletesliver.php \
7573
www/portal/deletesshkey.php \
@@ -128,14 +126,11 @@ dist_svcweb_DATA = \
128126
www/portal/join-this-project.php \
129127
www/portal/listresources.php \
130128
www/portal/listresources_plain.php \
131-
www/portal/logging_test.php \
132-
www/portal/ma_controller_test.php \
133129
www/portal/maintenance_redirect_page.php \
134130
www/portal/map.html \
135131
www/portal/map.php \
136132
www/portal/modify.php \
137133
www/portal/omni-bundle.php \
138-
www/portal/pa_controller_test.php \
139134
www/portal/permission_manager_test.php \
140135
www/portal/portal.php \
141136
www/portal/portal_omni_config.php \
@@ -155,7 +150,6 @@ dist_svcweb_DATA = \
155150
www/portal/rspecs.php \
156151
www/portal/rspecupload.php \
157152
www/portal/rspecview.php \
158-
www/portal/sa_controller_test.php \
159153
www/portal/services.php \
160154
www/portal/settings.php \
161155
www/portal/slice-add-resources.js \
@@ -168,7 +162,6 @@ dist_svcweb_DATA = \
168162
www/portal/slices.php \
169163
www/portal/sliverdelete.php \
170164
www/portal/sliverstatus.php \
171-
www/portal/sr_controller_test.php \
172165
www/portal/sshkeyedit.php \
173166
www/portal/starter-status-bar.php \
174167
www/portal/status_constants.php \

‎portal/gcf.d/gcf.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ slice_duration=7200
5555

5656
# URLs for the real SA and MA and SR to proxy for
5757
# FIXME: To make certs work, replace localhost with real host name
58-
sa_url=https://localhost/sa/sa_controller.php
59-
ma_url=https://localhost/ma/ma_controller.php
60-
sr_url=https://localhost/sr/sr_controller.php
61-
pa_url=https://localhost/pa/pa_controller.php
58+
sa_url=https://localhost/SA
59+
ma_url=https://localhost/MA
60+
sr_url=https://localhost:8444/SR
61+
pa_url=https://localhost/SA
6262

6363
# Path to the MA PEM cert - the signer of experimenter certs
6464
macert_path=/usr/share/geni-ch/ma/ma-cert.pem

‎portal/www/portal/cs_controller_test.php

-158
This file was deleted.

0 commit comments

Comments
 (0)