801 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christer Edwards	548ab2e250	Merge pull request #479 from JRGTH/master ... Make sure to check/bootstrap directories first	2022-01-13 12:20:51 -07:00
Christer Edwards	9fa07ae24e	Merge pull request #480 from robarnold/import ... Import iocage basejails as Bastille thin jails	2022-01-13 12:20:32 -07:00
Rob Arnold	523c3f0bde	Import iocage basejails as Bastille thin jails ... I think these are the same concept, but with slightly different execution. The main idea is to have a central base system that is shared (readonly) among multiple jails. When this base system is updated, all the jails that reference it immediately see the new system files. This is implemented in iocage as a set of individual zfs mounts, one per system directory. In Bastille, each system directory is symlinked into a subdirectory of a single zfs mount. My test plan here was to import an exported iocage basejail and verify that its Bastille version has the right fstab and symlink changes: ``` Validating file: ssl_2021-11-19.zip... File validation successful! Importing 'ssl' from foreign compressed .zip archive. Archive: ssl_2021-11-19.zip extracting: ssl_2021-11-19 extracting: ssl_2021-11-19_root Receiving ZFS data stream... Generating jail.conf... Updating symlinks... ln: usr/src: Directory not empty Warning: directory usr/src on imported jail was not empty and will not be updated by Bastille Container 'ssl' imported successfully. ```	2022-01-09 18:05:05 -08:00
JRGTH	af0e9a95a4	Allow --safe to be added to defined options	2022-01-04 17:17:36 -04:00
JRGTH	26e8f382e4	Override case options by the user defined option(s)	2022-01-04 17:03:07 -04:00
JRGTH	788e4c283b	Make sure to check/bootstrap directories first	2022-01-03 09:23:10 -04:00
Christer Edwards	a56cb2d433	Merge pull request #478 from yaazkal/fix_create_vnet ... Fix create vnet jails	2021-12-28 20:59:42 -07:00
yaazkal	17e4fa78f9	[FIX] vnet: use the right search pattern to choose the unique epair	2021-12-28 22:42:52 -05:00
yaazkal	c8545e8598	[REF] indentation: change tab to spaces	2021-12-28 21:22:30 -05:00
yaazkal	9a47a6c573	[REF] SC2003: expr is antiquated	2021-12-28 21:19:54 -05:00
Christer Edwards	00d9e03520	Merge pull request #477 from cedwards/christmas_release ... prepare for 0.9.20211225 release	2021-12-24 20:59:46 -07:00
Christer Edwards	9010b58eb8	prepare for 0.9.20211225 release	2021-12-24 20:58:14 -07:00
Christer Edwards	aaea27dcb3	Merge pull request #476 from cedwards/host_pkg_fix ... accidentally the jail name in run test	2021-12-23 14:36:14 -07:00
Christer Edwards	c825f0ca75	accidentally the jail name in run test	2021-12-23 14:34:43 -07:00
Christer Edwards	7558fd42ca	Merge pull request #475 from cedwards/jls_patch ... change new PKG option from -P to -H	2021-12-23 14:19:10 -07:00
Christer Edwards	570c80ba85	change new PKG option from -P to -H	2021-12-23 14:13:23 -07:00
Christer Edwards	b7914ba67a	Merge pull request #474 from cedwards/jls_patch ... jls path fix + support using host package manager	2021-12-23 14:01:36 -07:00
Christer Edwards	e21d31518a	jls path fix + support using host package manager	2021-12-23 13:57:18 -07:00
Christer Edwards	d3d5bf2df4	Merge pull request #473 from cedwards/debian_bullseye ... add Debian 11 'bullseye' to Linux supported list	2021-12-22 18:38:20 -07:00
Christer Edwards	2f59bdecec	add Debian 11 'bullseye' to Linux supported list	2021-12-22 18:35:49 -07:00
Christer Edwards	a115ba5b87	Merge pull request #420 from JRGTH/master ... Extra validation for Linux jails, small changes	2021-12-21 20:15:58 -07:00
Christer Edwards	ef070c9aed	Merge pull request #450 from w4andy/feature/update-template ... easy way to update templates	2021-12-21 19:29:29 -07:00
Christer Edwards	e2f051f899	Merge pull request #471 from cedwards/fix-vnet ... hotfix for the VNET interface description patch	2021-12-21 19:21:23 -07:00
Christer Edwards	5dabc75257	hotfix for the VNET interface description patch	2021-12-21 19:20:31 -07:00
Christer Edwards	8683ad15d2	Merge pull request #469 from cedwards/fix_460_jls_path ... use full path when calling jls binary	2021-12-17 19:12:19 -07:00
Christer Edwards	faf3b2b691	use full path when calling jls binary	2021-12-17 19:09:49 -07:00
Christer Edwards	8a4b0a1f5c	Merge pull request #467 from yaazkal/tzdata ... Use host's time zone by default for jails	2021-12-17 18:28:12 -07:00
yaazkal	68951de687	[FIX] Only use host's time zone for jails when already set in host	2021-12-12 12:38:05 -05:00
yaazkal	35d3038bea	[REF] Use host's time zone for jails by default	2021-12-12 12:10:39 -05:00
Christer Edwards	947ed27f90	Merge pull request #445 from frikilax/custom_template_path ... TEMPLATE.SH::ADDED:: ability to apply templates using a custom directory path	2021-12-09 10:54:23 -07:00
Christer Edwards	c09a5b05bf	Merge pull request #459 from robarnold/description ... Add a description to the host vnet interface	2021-12-09 10:53:28 -07:00
Christer Edwards	bbe44f79c6	Merge pull request #466 from yaazkal/ref_bootstrap ... [REF] bootsrap: Removes code duplication to prevent future errors	2021-12-09 10:52:49 -07:00
Christer Edwards	4c4edc07c5	Merge pull request #451 from w4andy/update-vagrant ... update vagrant to FreeBSD-13.0 and install git	2021-12-09 10:51:37 -07:00
Christer Edwards	da2f9bce8e	Merge pull request #446 from frikilax/clone_fix ... Fixed to update_fstab() in clone.sh	2021-12-09 10:50:32 -07:00
Christer Edwards	3af8d7384c	Merge pull request #442 from zilti/master ... Fix for issue #403	2021-12-09 10:49:18 -07:00
Christer Edwards	7c255d26b3	Merge pull request #452 from w4andy/verify-fix-bastillefile-include ... add recursive verify for includes in Bastillefile	2021-12-09 10:48:09 -07:00
Christer Edwards	2327c6a662	Merge pull request #461 from robarnold/devfs ... Use the devfs_ruleset number from imported iocage jails	2021-12-09 10:46:58 -07:00
Christer Edwards	d6b12f93e7	Merge pull request #465 from draga79/master ... Added code and -B option to "create" to allow creating/managing jails attached to external bridge	2021-12-09 10:45:58 -07:00
Yaazkal	1c5d343171	[REF] bootsrap: Removes code duplication to prevent future errors	2021-12-05 08:56:59 -05:00
Stefano Marinelli	d951a70b30	Added doc and fixes - bridge support	2021-12-02 15:22:08 +01:00
Stefano Marinelli	ec1356df08	Added and modified code for existing bridge jail attachement.	2021-12-02 15:06:47 +01:00
Rob Arnold	5aba3df6ae	Use the devfs_ruleset number from imported iocage jails ... This property is not set by default on all iocage jails. By default, iocage assumes this value is 4. Confusingly, if you query this value from iocage while the jail is running, it will give a dynamically generated value. However, a jail must be stopped to be exported, so we can trust the value in config.json.	2021-11-19 21:46:22 -08:00
Rob Arnold	0a232dd140	Add a description to the host vnet interface ... This makes it much easier to understand `ifconfig` when run on the jail host. Not sure how to test this, but manually appyling this via `bastille edit` to an existing vnet jail had the right effects when I restarted the jail.	2021-11-14 19:53:55 -08:00
Christer Edwards	e49662bab4	Merge pull request #457 from cedwards/readthedocs ... fixing issue with docs (conflict with docutils v0.18)	2021-11-07 09:44:25 -07:00
Christer Edwards	f4c60291c0	fixing issue with docs (conflict with docutils v0.18)	2021-11-07 09:42:13 -07:00
Christer Edwards	d1043bded2	Merge pull request #456 from cedwards/docs-quickfix ... minor fix for docs path	2021-11-05 16:08:49 -06:00
Christer Edwards	6f8f025baf	minor fix for docs path	2021-11-05 16:08:04 -06:00
Christer Edwards	a73173e828	Merge pull request #455 from cedwards/docs-quickfix ... add zfs-support doc to toctree	2021-11-05 16:06:13 -06:00
Christer Edwards	97d15d1a2f	add zfs-support doc to toctree	2021-11-05 16:05:16 -06:00
Christer Edwards	22b8f2f041	Merge pull request #454 from cedwards/docs-quickfix ... fix image path for zfs support screenshot	2021-11-05 15:53:13 -06:00