Changeset 38208

Timestamp:

Apr 28, 2015, 2:54:20 PM (11 years ago)

Author:

eugene

Message:

move passwords out of files which are checked into svn

Location:

trunk/ippMonitor

Files:

• config.dat.in (added)
• configure.tcsh (modified) (5 diffs)
• raw/site.php.in (modified) (2 diffs)

trunk/ippMonitor/configure.tcsh

@@ -10 +10 @@
 
 set htdocs  = ""
-set dbhost  = ""
-set dbuser  = ""
-set dbpass  = ""
+# set dbhost  = ""
+# set dbuser  = ""
+# set dbpass  = ""
 
 set prefix  = ""
@@ -52 +52 @@
    endif
    breaksw;
-  case --dbhost*
-   if ("$1" == "--dbhost") then
-     shift
-     set dbhost = $1
-   else
-     set dbhost = `echo $1 | tr = ' ' | awk '{print $2}'`
-   endif
-   breaksw;
-  case --dbuser*
-   if ("$1" == "--dbuser") then
-     shift
-     set dbuser = $1
-   else
-     set dbuser = `echo $1 | tr = ' ' | awk '{print $2}'`
-   endif
-   breaksw;
-  case --dbpass*
-   if ("$1" == "--dbpass") then
-     shift
-     set dbpass = $1
-   else
-     set dbpass = `echo $1 | tr = ' ' | awk '{print $2}'`
-   endif
-   breaksw;
+#   case --dbhost*
+#    if ("$1" == "--dbhost") then
+#      shift
+#      set dbhost = $1
+#    else
+#      set dbhost = `echo $1 | tr = ' ' | awk '{print $2}'`
+#    endif
+#    breaksw;
+#   case --dbuser*
+#    if ("$1" == "--dbuser") then
+#      shift
+#      set dbuser = $1
+#    else
+#      set dbuser = `echo $1 | tr = ' ' | awk '{print $2}'`
+#    endif
+#    breaksw;
+#   case --dbpass*
+#    if ("$1" == "--dbpass") then
+#      shift
+#      set dbpass = $1
+#    else
+#      set dbpass = `echo $1 | tr = ' ' | awk '{print $2}'`
+#    endif
+#    breaksw;
   case --prefix*
    if ("$1" == "--prefix") then
@@ -142 +142 @@
 echo "site:   $site"
 echo "htdocs: $htdocs"
-echo "dbhost: $dbhost"
-echo "dbuser: $dbuser"
-echo "dbpass: $dbpass"
+# echo "dbhost: $dbhost"
+# echo "dbuser: $dbuser"
+# echo "dbpass: $dbpass"
 echo "DBI:    $DBI"
 echo
 
 if ("$htdocs" == "") goto usage
-if ("$dbhost" == "") goto usage
-if ("$dbuser" == "") goto usage
-if ("$dbpass" == "") goto usage
+# if ("$dbhost" == "") goto usage
+# if ("$dbuser" == "") goto usage
+# if ("$dbpass" == "") goto usage
 
 # BINDIR holds the output binary files
@@ -187 +187 @@
 # convert raw/site.php.in to raw/site.php
 if (-e raw/site.php) mv -f raw/site.php raw/site.php~
-cat raw/site.php.in | sed "s|@DBHOST@|$dbhost|"  > tmp.1
-cat tmp.1           | sed "s|@DBUSER@|$dbuser|"  > tmp.2
-cat tmp.2           | sed "s|@DBPASS@|$dbpass|"  > tmp.1
-cat tmp.1           | sed "s|@BINDIR@|$bindir|"  > tmp.2
+cat raw/site.php.in | sed "s|@BINDIR@|$bindir|"  > tmp.2
 cat tmp.2           | sed "s|@LIBDIR@|$libdir|"  > tmp.1
 cat tmp.1           | sed "s|@PERLLIB@|$libdir|" > tmp.2
 cat tmp.2           | sed "s|@SITE@|$site|"      > tmp.1
 cat tmp.1           | sed "s|@DBI@|$DBI|"        > tmp.2
-cat tmp.2           | sed "s|@HOST@|$hostname|"  > raw/site.php
+cat tmp.2           | sed "s|@HOST@|$hostname|"  > tmp.1
+awk 'BEGIN{t = 0}((t == 0) && ($1 != "@CONFIG.DAT@")){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.1 > raw/site.php
+cat config.dat >> raw/site.php
+awk 'BEGIN{t = 0}(t == 1){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.1 >> raw/site.php
+
 rm -f tmp.1 tmp.2
 
@@ -213 +214 @@
 set the IPP installation directory root with --prefix
 
-set the database host, user, password with: --dbhost, --dbuser, -dbpass
- 
+set the site.php file based on config.dat in this directory
+
 either --prefix or both --bindir and --libdir and [--datadir or --site] are required
 

trunk/ippMonitor/raw/site.php.in

@@ -2 +2 @@
 
 $WWWHOST = "@HOST@";
-$DBHOST  = "@DBHOST@";
-$DBUSER  = "@DBUSER@";
-$DBPASS  = "@DBPASS@";
 
 $PERLLIB = "@PERLLIB@";
@@ -16 +13 @@
 $DBI     = "@DBI@";
 
-// Temporary files belonging to DELETION_USER and older than 
-// DELETION_DELAY minutes will be delayed by the
-// delete_old_tmp_files() function (see raw/ipp.php)
-$DELETION_USER  = "apache";
-$DELETION_DELAY = 15;
-
-$REPL_HOST_IPPADMIN = "ipp0012.IfA.Hawaii.Edu";
-$REPL_USER_IPPADMIN = "ippMonitor";
-$REPL_PASSWORD_IPPADMIN = "ippMonitor";
-$REPL_DBNAME_IPPADMIN = "ipp001 (gpc1, isp, ippadmin, czardb, ipptopsps, megacam, ssp, uip)" ;
-
-$REPL_HOST_NEBULOUS = "ippdb02.IfA.Hawaii.Edu";
-$REPL_USER_NEBULOUS = "ippMonitor";
-$REPL_PASSWORD_NEBULOUS = "ippMonitor";
-$REPL_DBNAME_NEBULOUS = "ippdb02 (nebulous / 50,000 sec behind is acceptable / usually stopped on Mondays and Tuesdays for backups)";
-
-$REPL_HOST_PSTAMP = "ippc19.IfA.Hawaii.Edu";
-$REPL_USER_PSTAMP = "ippMonitor";
-$REPL_PASSWORD_PSTAMP = "ippMonitor";
-$REPL_DBNAME_PSTAMP = "ippc19 (ippRequestServer)";
-
-$REPL_HOST_GPC1 = "ippdb03.IfA.Hawaii.Edu";
-$REPL_USER_GPC1 = "ippMonitor";
-$REPL_PASSWORD_GPC1 = "ippMonitor";
-$REPL_DBNAME_GPC1 = "ippdb03 (czardb, gpc1, ippadmin, ipptopsps, megacam, skycells, ssp, uip)";
-
-$REPL_HOST_ISP = "ippc17.IfA.Hawaii.Edu";
-$REPL_USER_ISP = "ippMonitor";
-$REPL_PASSWORD_ISP = "ippMonitor";
-$REPL_DBNAME_ISP = "ippc17 (isp)";
-
-$REPL_HOST_NEBULOUS_SECONDARY = "ippdb06.IfA.Hawaii.Edu";
-$REPL_USER_NEBULOUS_SECONDARY = "ippMonitor";
-$REPL_PASSWORD_NEBULOUS_SECONDARY = "ippMonitor";
-$REPL_DBNAME_NEBULOUS_SECONDARY = "ippdb06 (secondary nebulous)";
+// insert config.dat here
+@CONFIG.DAT@
 
 ?>