diff options
| author | Joachim Tingvold <joachim@tingvold.com> | 2015-03-22 21:47:29 +0100 |
|---|---|---|
| committer | Joachim Tingvold <joachim@tingvold.com> | 2015-03-22 21:47:29 +0100 |
| commit | a988b1cf0a0083bb6f2a70dfa27a81ced7cb87aa (patch) | |
| tree | 6bf5c12051a4dc3444c309276bced5e314ff9986 | |
| parent | 99000a156e95475cb4ba3bee9cfd518605047506 (diff) | |
Copy new bootstrap-folder.
| -rw-r--r-- | bootstrap/README.md | 3 | ||||
| -rwxr-xr-x | bootstrap/create-shellconf.pl | 14 | ||||
| -rwxr-xr-x | bootstrap/update-tools.sh | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/bootstrap/README.md b/bootstrap/README.md index 8ebb444..149da80 100644 --- a/bootstrap/README.md +++ b/bootstrap/README.md @@ -37,8 +37,7 @@ Start by placing the 'tgmanage' directory as '/root/tgmanage' on the bootstrap box. Change into the 'tgmanage' directory. Next, run 'bootstrap/install-dependencies.sh boot' - -Edit 'include/config.local.pm' and update for this year's TG. Use +Copy 'include/config.pm.dist' to 'include/config.pm'. Edit for this year's TG. Use 'bootstrap/create-shellconf.pl' to extract configuration from the perl module to create/update the 'include/tgmanage.cfg.sh' configuration script. diff --git a/bootstrap/create-shellconf.pl b/bootstrap/create-shellconf.pl index 9c4b500..63e4361 100755 --- a/bootstrap/create-shellconf.pl +++ b/bootstrap/create-shellconf.pl @@ -15,16 +15,16 @@ my $shellconf_file = "include/tgmanage.cfg.sh"; open CFG, ">" . $shellconf_file or die ($! . " " . $shellconf_file ); -print CFG "# This file is autogenerated by tools/create-shellconf.pl,\n"; +print CFG "# This file is autogenerated by bootstrap/create-shellconf.pl,\n"; print CFG "# using data from nms::config.\n"; print CFG "#\n"; print CFG "# Do you need new common/configuration variables?\n"; -print CFG "# Add/update include/config.local.pm and tools/create-shellconf.pl\n\n"; -print CFG "PRIMARY=\"$nms::config::pri_hostname.$nms::config::tgname.gathering.org\"\n"; -print CFG "SECONDARY=\"$nms::config::sec_hostname.$nms::config::tgname.gathering.org\"\n"; +print CFG "# Add/update include/config.local.pm and bootstrap/create-shellconf.pl\n\n"; print CFG "TGNAME=\"$nms::config::tgname\"\n\n"; +print CFG "PRIMARY=\"$nms::config::pri_hostname.$nms::config::tgname.gathering.org\"\n"; print CFG "PRI_V4=\"$nms::config::pri_v4\"\n"; -print CFG "PRI_V6=\"$nms::config::pri_v6\"\n"; -print CFG "SEC_V4=\"$nms::config::sec_v4\"\n\n"; -print CFG "SEC_V6=\"$nms::config::sec_v6\"\n\n"; +print CFG "PRI_V6=\"$nms::config::pri_v6\"\n\n"; +print CFG "SECONDARY=\"$nms::config::sec_hostname.$nms::config::tgname.gathering.org\"\n"; +print CFG "SEC_V4=\"$nms::config::sec_v4\"\n"; +print CFG "SEC_V6=\"$nms::config::sec_v6\"\n"; close CFG; diff --git a/bootstrap/update-tools.sh b/bootstrap/update-tools.sh index 2b931ff..360e6a4 100755 --- a/bootstrap/update-tools.sh +++ b/bootstrap/update-tools.sh @@ -15,8 +15,8 @@ ssh -l root ${PRIMARY} "mkdir -p ~/tgmanage" ssh -l root ${SECONDARY} "mkdir -p ~/tgmanage" scp -r netlist.txt root@${PRIMARY}:tgmanage/ -scp -r tools root@${PRIMARY}:tgmanage/ -scp -r tools root@${SECONDARY}:tgmanage/ +scp -r bootstrap root@${PRIMARY}:tgmanage/ +scp -r bootstrap root@${SECONDARY}:tgmanage/ scp -r include root@${PRIMARY}:tgmanage/ scp -r include root@${SECONDARY}:tgmanage/ |