From a81894a9b6043c9c9fbf7634dcce1e88bb95cf9b Mon Sep 17 00:00:00 2001
From: Ben Fenster <ben@benjaminfenster.com>
Date: Thu, 15 Sep 2022 07:02:24 -0600
Subject: [PATCH] Eliminate vestigial 'dbin' and 'nisdev' directories.

---
 maps/hosts.map.erb |  2 --
 maps/sites.map     | 24 +++++++-----------------
 test_router.sh     |  1 -
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/maps/hosts.map.erb b/maps/hosts.map.erb
index aa5cff61..6f475004 100644
--- a/maps/hosts.map.erb
+++ b/maps/hosts.map.erb
@@ -46,8 +46,6 @@ wordpress <%= ENV['BACKEND_WP_APP'] || "ist-wp-app-#{ENV['LANDSCAPE']}.bu.edu" %
 #  PHP
 # # # # # # # # # # # # # # # # # # # #
 
-dbin <%= ENV['BACKEND_DBIN'] || "ist-web-dbin-#{ENV['LANDSCAPE']}.bu.edu" %> ;
-
 phpbin <%= ENV['BACKEND_PHPBIN'] || "ist-web-phpbin-#{ENV['LANDSCAPE']}.bu.edu" %> ;
 phpbin-aws ist-web-phpbin-aws-prod.bu.edu ;
 
diff --git a/maps/sites.map b/maps/sites.map
index 1ec435b1..201f247f 100644
--- a/maps/sites.map
+++ b/maps/sites.map
@@ -94,16 +94,8 @@ _/dnamixtures/uploads static-public ;
 _/courseware-manager     django ;
 _/law-pub        django ;
 
+# PHP applications (dbin / phpbin)
 
-# Standalone Sites:
-
-_/buniverse phpbin-aws ;
-_/calendar phpbin-aws ;
-_/nisdev phpbin ;
-
-# dbin:
-
-_/dbin dbin ;
 _/dbin/agni phpbin-aws ;
 _/dbin/archives static-public ;
 _/dbin/bands phpbin-aws ;
@@ -120,12 +112,6 @@ _/dbin/project-inclusive phpbin-aws ;
 _/dbin/quantumconcepts phpbin-aws ;
 _/dbin/stemcells redirect_asis ;
 
-
-# phpbin:
-
-_/phpbin phpbin ;
-_/wiki phpbin ;
-
 _/phpbin/calendar phpbin-aws ;
 _/phpbin/cashier-admin redirect_asis ;
 _/phpbin/cecredential phpbin-aws ;
@@ -154,10 +140,12 @@ _/phpbin/oompatech phpbin-aws ;
 _/phpbin/organ-library phpbin-aws ;
 _/phpbin/parking phpbin-aws ;
 _/phpbin/rcr phpbin-aws ;
+_/phpbin/security phpbin ;
 _/phpbin/signup phpbin-aws ;
 _/phpbin/sleep phpbin-aws ;
 _/phpbin/ssw-network phpbin-aws ;
 _/phpbin/static-sites phpbin-aws ;
+_/phpbin/telegraph phpbin ;
 _/phpbin/training phpbin-aws ;
 _/phpbin/webdis phpbin-aws ;
 _/phpbin/wiki phpbin-aws ;
@@ -402,6 +390,7 @@ _/bunano redirect_asis ;
 _/bunextchicago redirect_asis ;
 _/bunextla redirect_asis ;
 _/bunextsf redirect_asis ;
+_/buniverse phpbin-aws ;
 _/burc redirect_asis ;
 _/burppe redirect_asis ;
 _/burst redirect_asis ;
@@ -428,6 +417,7 @@ _/buzzlab redirect_asis ;
 _/caadlab static-public ;
 _/cader/av static-public ;
 _/cagt redirect_asis ;
+_/calendar phpbin-aws ;
 _/cap static-public ;
 _/capdraft redirect_asis ;
 _/cards redirect_asis ;
@@ -576,10 +566,10 @@ _/data static-public ;
 _/data-sciences-center static-public ;
 _/dayofservice redirect_asis ;
 _/daysofservice redirect_asis ;
-_/dct redirect_asis ;
 _/dbin-cnsb-assets static-public ;
 _/dbin-cupidcubesat-data static-public ;
 _/dbin-dance static-public ;
+_/dct redirect_asis ;
 _/degreecomplete redirect_asis ;
 _/dental/lobbyscreen static-public ;
 _/dental/nerb-mcmanama static-public ;
@@ -615,8 +605,8 @@ _/ebrochures redirect_asis ;
 _/eci/econpapers static-public ;
 _/ecllscholarship redirect_asis ;
 _/ecologyonline static-public ;
-_/edtech redirect_asis ;
 _/econ/RePEc static-public ;
+_/edtech redirect_asis ;
 _/electric redirect_asis ;
 _/eliewieselarchive redirect_asis ;
 _/eliewieselday redirect_asis ;
diff --git a/test_router.sh b/test_router.sh
index 83e3d28c..e8103994 100755
--- a/test_router.sh
+++ b/test_router.sh
@@ -229,7 +229,6 @@ test_url "uiscgi-http-studentlink-menu" "http://${CONNECT_TO}/link/bin/uiscgi_st
 if [ "$LANDSCAPE" != "syst" ]; then
 echo ""
 echo "### Test PHP and Django services"
-test_url "dbin-http-oittest" http://${CONNECT_TO}/dbin/oittest/info.php 200 dbin '<h2>PHP License</h2>'
 test_url "phpbin-http-buniverse" http://${CONNECT_TO}/buniverse/ 200 phpbin buniverse
 test_url "django-http-cellphone" http://${CONNECT_TO}/cellphone-compliance/ 302 django "Location: http://$HOST/cellphone-compliance/accounts/login"
 test_url "django-https-cellphone" https://${CONNECT_TO}/cellphone-compliance/ 302 django "Location: https://$HOST/cellphone-compliance/accounts/login"