Commit Graph

588 Commits

Author SHA1 Message Date
thomashaw
08aad783df Minor cleanup 2017-10-20 14:26:16 +01:00
thomashaw
8a0dceb12e Minor changes to batch_secgen.rb 2017-10-20 13:03:13 +01:00
thomashaw
2172110037 batch_secgen: added README.md with setup instructions. 2017-10-20 13:02:54 +01:00
thomashaw
90cf6885b4 labs scenario cleanup 2017-10-20 10:42:24 +01:00
thomashaw
c0c180a9aa Adding an example and README entry for the network-ranges / IP_addresses datastore / inputting an IP_address into a network module. 2017-10-20 10:41:09 +01:00
thomashaw
265fd87ae1 updated IRI lab scenarios to use the new datastore="IP_addresses" functionality 2017-10-18 15:40:01 +01:00
thomashaw
6e56a25be9 network changes cleanup - no need for <network/> changes 2017-10-18 15:03:26 +01:00
thomashaw
0033a7c642 network-ranges => scenario passthrough / rework 2017-10-18 14:57:53 +01:00
thomashaw
444d9ea9eb batch_secgen: changed default option of random ip range exclusion to Y 2017-10-17 10:23:14 +01:00
thomashaw
97f6011fa9 Merge remote-tracking branch 'upstream/backup_lab' into labs_squashed_rwrk 2017-10-13 16:59:38 +01:00
thomashaw
624e542d86 formatting 2017-10-13 16:59:01 +01:00
Z. Cliffe Schreuders
e62a53dcb5 More labsheet fixes 2017-10-13 16:28:05 +01:00
Z. Cliffe Schreuders
a3adbdb331 Minor labsheet fixes 2017-10-13 16:22:05 +01:00
secgen server
a95d957962 fixed destroy only broken vms 2017-10-13 16:20:24 +01:00
Z. Cliffe Schreuders
39faceccbf Minor labsheet fixes 2017-10-13 16:02:29 +01:00
thomashaw
7fd9d80e1a More changes to retry destroy <failed_vm> 2017-10-13 15:24:37 +01:00
thomashaw
d62c15137f Changes to retry destroy <failed_vm> and shortened hackerbot_server in system name to hb_server 2017-10-13 14:35:24 +01:00
Z. Cliffe Schreuders
0af894caf7 backups lab 2017-10-13 13:58:29 +01:00
thomashaw
fccd4e0b33 Only destroy broken VMs 2017-10-13 13:48:08 +01:00
Z. Cliffe Schreuders
3a5bd1a288 backups lab 2017-10-13 13:20:10 +01:00
secgen server
6b87f6ca31 pushing work from server 2017-10-13 11:47:39 +01:00
secgen server
a68079786e Merge branch 'labs_squashed_rwrk' of https://github.com/cliffe/SecGen into labs_squashed_rwrk 2017-10-09 12:06:32 +01:00
thomashaw
e8a3e82d81 lab2 2017-10-09 12:00:04 +01:00
thomashaw
0d91381c15 WiP: wrap network_ranges check in conditional 2017-10-09 11:28:39 +01:00
secgen server
896314834d merging 2017-10-07 14:21:32 +01:00
secgen server
5b751a1ed1 merge me 2017-10-07 14:21:00 +01:00
thomashaw
a65d19d85e Adding --provision to retry loop. 2017-10-07 14:18:39 +01:00
thomashaw
3e1f9c9b46 batch_secgen: Added --all to reset command. 2017-10-07 14:17:54 +01:00
secgen server
606396a678 Merge branch 'labs_squashed_rwrk' of https://github.com/cliffe/SecGen into labs_squashed_rwrk 2017-10-07 11:40:53 +01:00
secgen server
ad8481b999 added sleep to batch 2017-10-07 11:40:49 +01:00
thomashaw
0ee163d729 batch_secgen: Added reset command. Reset all jobs with status 'running' or 'error' to 'todo'. 2017-10-07 11:36:05 +01:00
thomashaw
2c40d1632b student ids 2017-10-05 19:48:35 +01:00
thomashaw
69cf1c57b8 added - and shorter server name for IRI labs 2017-10-05 15:11:50 +01:00
secgen server
7283d1979a re-added environment to batch-secgen.service 2017-10-05 14:54:25 +01:00
thomashaw
46e4d26915 Vagrantfile.erb: Renamed SPICE => spice 2017-10-05 14:36:00 +01:00
thomashaw
7cfde8317a Rework WIP: Testing changes so far. Still need to rework network-ranges passthrough hack with something more flexible. 2017-10-05 14:24:56 +01:00
thomashaw
7abaabe9b6 move <ovirt_template> next to basebox url in metadata and schema 2017-10-05 11:49:59 +01:00
thomashaw
2a7229e6fa batch-secgen.service: added user & group to run service as 2017-10-05 11:48:20 +01:00
thomashaw
78ba59776a batch_secgen: Automatically back up the projects/ directory of successful projects, added prompt on excluding ranges currently in table from randomised ip generation. 2017-10-05 11:47:26 +01:00
Z. Cliffe Schreuders
ce502abcdb Hackerbot, labs, and associated changes 2017-09-28 16:35:28 +01:00
thomashaw
cef610bf04 oVirt now uses VM memory allocation based on command line options. Added missing options to usage. Added default memory allocations for oVirt VMs based on base type. 2017-09-28 15:32:47 +01:00
thomashaw
d43fe74492 Vagrantfile: oVirt hostname, replace _ with - in full hostname string, rather than just system_name. Fixes error when prefix contains underscores. 2017-09-28 13:47:22 +01:00
thomashaw
1c44c7baec utilities/handy_cli_tools 2017-09-26 19:42:28 +01:00
thomashaw
fe7c81dfc0 utilities/kde_minimal 2017-09-26 19:41:47 +01:00
thomashaw
439605c10b utilities/metasploit_framework 2017-09-26 19:41:37 +01:00
thomashaw
e814a7fe03 scenarios/labs/incremental_base_boxes.xml 2017-09-26 19:41:09 +01:00
thomashaw
01baa313fc ovirt-integration: reverting cloud-init change and included it in base template instead 2017-09-26 18:58:13 +01:00
thomashaw
8e38813db2 Updates: SecGen => oVirt Integration 2017-09-26 18:55:09 +01:00
thomashaw
0c13e77c23 Vagrantfile fix 2017-09-21 16:33:57 +01:00
thomashaw
3205338f67 renamed postgresql database from secgen_batch to batch_secgen for consistency 2017-09-21 15:58:53 +01:00