BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity
929 Commits 13 Branches 34 Tags
4efcc5021c63df2c02c8a5e4f1a2811703f19e67
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christer Edwards 4efcc5021c update copyright dates 2023-07-14 21:02:14 -06:00
Christer Edwards 9588d52686 Merge pull request #566 from nwisemanII/SSHIdentBootstrap 
Accept ssh git addresses in bootstrap
 2023-01-16 11:46:16 -07:00
Christer Edwards 0629233f25 Merge pull request #534 from cqexbesd/config_rebased 
Make parsing on jail.conf more robust
 2022-12-13 20:58:30 -07:00
Christer Edwards c00d8a4e05 Merge pull request #561 from Vertalo/ip-in-use 
Fix bug in ip-in-use test
 2022-12-13 20:54:58 -07:00
Christer Edwards bfce059225 Merge pull request #560 from chriswells0/pf-config 
Make pf table name and external interface configurable.
 2022-12-13 20:54:33 -07:00
Christer Edwards ec7a6d8f6d Merge pull request #559 from chriswells0/pf-jails 
Use "bastille config" to get ipv4.addr.
 2022-12-13 20:54:11 -07:00
Christer Edwards 0240d6532b Merge pull request #546 from PythonLinks/master 
Updating the documentation for public clouds with IPV6 networking.
 2022-12-13 20:53:38 -07:00
Christer Edwards 0ee17be875 Merge pull request #558 from BastilleBSD/linux_create_bugfix 
fixing regression in create.sh for Linux containers
 2022-11-02 21:18:00 -06:00
Christer Edwards 778ef6e581 fixing regression in create.sh for Linux containers 2022-11-02 21:17:05 -06:00
Christer Edwards a73b9972e3 Merge pull request #556 from BastilleBSD/start_stop_order 
fixes #389 regarding shutdown order
 2022-11-01 17:24:44 -06:00
Christer Edwards 6a7ab04d9b fixes #389 regarding shutdown order 2022-11-01 17:23:00 -06:00
Christer Edwards 937986f4b6 Merge pull request #554 from BastilleBSD/makefile_install_version 
Makefile install target updates version to match git rev of HEAD
 2022-10-27 17:13:55 -06:00
Christer Edwards a4102c7f61 Makefile install target updates version to match git rev of HEAD 2022-10-27 17:10:54 -06:00
Christer Edwards 3702066864 Merge pull request #536 from cqexbesd/minor 
Minor Changes
 2022-10-27 11:32:27 -06:00
Christer Edwards 79897e9af7 Merge pull request #539 from patmaddox/gcp-docs 
Document Bastille VNET on GCP
 2022-10-27 11:30:34 -06:00
Christer Edwards 55c7c4c6be Merge pull request #550 from Stormle/master 
Fixed typo in README.md
 2022-10-27 11:26:18 -06:00
Christer Edwards e5c71c794a Merge pull request #553 from frikilax/pkg_report_errors 
PKG::ADDED:: return error code and print error message when 'bastille pkg' fails
 2022-10-27 11:25:54 -06:00
Christer Edwards e04aee2617 Merge pull request #549 from JartX/advanced_mount_types 
Advanced Mount Types Support
 2022-10-27 11:10:38 -06:00
Christer Edwards 0dcefae18c Merge pull request #435 from CamilionEU/evilham-improve-ipv6-and-dualstack-creation 
[WIP] [feedback required] Improve dualstack and IPv6 support on jail creation
 2022-10-17 20:35:32 -06:00
Christer Edwards f1d73a0c02 Merge pull request #543 from tofazzz/master 
Updated "export" sub-command docs (0.9.20220216)
 2022-09-02 09:58:35 -06:00
Christer Edwards c50e99b3e7 Merge pull request #533 from cqexbesd/colour 
Enable colour only when writing to a tty
 2022-07-23 21:23:16 -06:00
Christer Edwards 639334052f Merge pull request #532 from cedwards/update_doc_version 
update versions from 12.x to 13.x
 2022-07-22 07:56:32 -06:00
Christer Edwards 260149c2a9 Merge pull request #530 from JRGTH/clone_cmd_fixes 
Update the exec.* with uniq_epair when cloning jails
 2022-07-18 10:31:59 -06:00
Christer Edwards 722adc44cb Merge pull request #531 from cedwards/cmd_bugfix 
bugfix for cmd when using ALL target
 2022-07-18 10:28:11 -06:00
Christer Edwards da377f4735 Merge pull request #529 from BastilleBSD/fete_nationale_2022 
prepare for fete nationale 2022
 2022-07-13 21:32:33 -06:00
Christer Edwards 6de6e7bc6f Merge pull request #519 from JRGTH/bootstrap_fixes 
Avoid cache/RELEASE dirs creation on Linux jails
 2022-07-10 20:23:44 -06:00
Christer Edwards 533d108d91 Merge pull request #526 from boogiewookie/master 
The text speaks of defining an OVERLAY but the example uses CP.
 2022-07-10 20:23:22 -06:00
Christer Edwards e8a72bcd75 Merge pull request #520 from JRGTH/cmd_fixes 
Allow 'bastille cmd' on Linux jails
 2022-05-31 13:36:31 -06:00
Christer Edwards 3ba1024704 Merge pull request #510 from cyrilst/patch-1 
Repair table, fix incorrect descriptions
 2022-05-04 14:50:24 -06:00
Christer Edwards dbb720fef4 Merge pull request #500 from eborisch/graceful_network_stop 
Permit outgoing network connections during stop action
 2022-05-04 14:49:26 -06:00
Christer Edwards d0903347a6 Merge pull request #502 from nmurali94/master 
Extend RDR to support logging
 2022-05-04 14:47:30 -06:00
Christer Edwards b9d38a5d01 Merge pull request #505 from ctuffli/patch-1 
Allow Linux jails to see their mount points
 2022-05-04 14:46:38 -06:00
Christer Edwards f14eddc958 Merge pull request #507 from ellislm/fix_vnet_epair 
fix non-unique epair creation when using vnet
 2022-05-04 14:45:33 -06:00
Christer Edwards e64c81d18a Merge pull request #515 from ddowse/template-ip6 
Add variable JAIL_IP6 to access ip6.addr in templates
 2022-05-04 14:44:00 -06:00
Christer Edwards 674a34d69c Merge pull request #511 from fellmoon/patch-1 
Update bootstrap.rst
 2022-05-04 14:38:39 -06:00
Christer Edwards ff7de9167a Merge pull request #498 from cedwards/master 
0.9.20220216 release
 2022-02-16 23:34:59 -07:00
Christer Edwards aafc2b3323 0.9.20220216 release 2022-02-16 23:28:09 -07:00
Christer Edwards efed673e76 Merge pull request #490 from noracenofun/new-option--p-for-list-release 
added the new option -p for list release
 2022-02-16 23:05:03 -07:00
Christer Edwards 6aa6e40db1 Merge pull request #485 from JRGTH/clonejail_support 
Initial support for clone jails
 2022-02-16 23:02:41 -07:00
Christer Edwards 4726c48813 Merge pull request #491 from JRGTH/rename_fixes 
Consistency improvements
 2022-02-16 22:59:31 -07:00
Christer Edwards 920ca1fba0 Merge pull request #497 from frikilax/fix_fstab_clone 
CLONE.SH::FIXED:: update fstab paths with new jail path
 2022-02-16 22:58:52 -07:00
Christer Edwards e4e1fadf35 Merge pull request #495 from gogolok/readme_fix_formatting 
README: Fix formatting
 2022-02-02 12:35:47 -07:00
Christer Edwards ab43a7569f Merge pull request #488 from JRGTH/rename_fixes 
Update Linuxjail name entries upon jail renaming
 2022-01-17 16:21:37 -07:00
Christer Edwards d7d0d864c3 Merge pull request #489 from noracenofun/bootstrap-aarch64/arm64-Debian/Ubuntu 
bootstrap aarch64/arm64 Debian/Ubuntu support
 2022-01-17 16:20:38 -07:00
Christer Edwards 5d9ea33889 Merge pull request #486 from noracenofun/patch-1 
optimizing command `list -a`
 2022-01-17 16:19:24 -07:00
Christer Edwards 38bb7faabf Merge pull request #483 from robarnold/import_vnet 
Import basic vnet settings from iocage
 2022-01-14 20:22:04 -07:00
Christer Edwards cc8e9f24a1 Merge pull request #482 from JRGTH/update_fixes 
Fix to allow 32-Bit base releases to be updated
 2022-01-14 20:18:16 -07:00
Christer Edwards 268d00be1f Merge pull request #484 from JRGTH/bootstrap_fixes 
Bugfix to prevent double directory creation when bootstrapping Linux …
 2022-01-14 20:04:18 -07:00
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
Christer Edwards a56cb2d433 Merge pull request #478 from yaazkal/fix_create_vnet 
Fix create vnet jails
 2021-12-28 20:59:42 -07: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
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
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
Christer Edwards 686fbc8572 fix image path for zfs support screenshot 2021-11-05 15:52:01 -06:00
Christer Edwards 85f138cd5a Merge pull request #453 from Bennykillua/zfs-support-to-docs 
Zfs support to docs
 2021-11-05 15:43:19 -06:00
Christer Edwards 27ea04712f Merge pull request #436 from yaazkal/patch-4 
Sets require NETWORKING in the rc script
 2021-08-07 20:55:37 -06:00
Christer Edwards fdc688bafe Merge pull request #433 from cedwards/linux-pkg-support 
basic PKG support for ubuntu/debian containers
 2021-07-31 19:49:09 -06:00
Christer Edwards 03c830bea4 basic PKG support for ubuntu/debian containers 2021-07-31 19:47:01 -06:00
Christer Edwards cd93e139a2 Merge pull request #432 from cedwards/mount_all_fix 
fix overloaded variable in mount command
 2021-07-31 15:24:12 -06:00
Christer Edwards cc38fabd31 fix overloaded variable in mount command 2021-07-31 15:22:17 -06:00
Christer Edwards c77ffb9617 Merge pull request #431 from cedwards/no_color_improvement 
improve NO_COLOR detection
 2021-07-31 15:06:05 -06:00
Christer Edwards 3a7e720e82 improve NO_COLOR detection 2021-07-31 15:04:08 -06:00
Christer Edwards 30ba4bbb69 revert double-slash fix 
this causes issues if the user doesn't provide a starting /. cosmetic only.
 2021-07-31 14:42:24 -06:00
Christer Edwards 7f1dbc17c9 Merge pull request #303 from yerrysherry/cmdbug 
bastille cmd exit code not respected #272
 2021-07-31 14:40:05 -06:00
Christer Edwards 5c89ac5a27 Merge branch 'master' into cmdbug 2021-07-31 14:39:24 -06:00
Christer Edwards c02a8735d8 Merge pull request #430 from yaazkal/debian10 
Adds: Debian 10 (Buster) as a release for linux jails
 2021-07-30 13:00:23 -06:00
Christer Edwards 4be0143de5 Merge pull request #429 from FloGatt/vnet_ipv6 
Added logic for setting ipv6_defaultrouter for vnet template
 2021-07-27 10:38:49 -06:00
Christer Edwards 47fed3a76d Merge pull request #427 from yaazkal/linux-debian-distros 
Adds: Debian 9 (Stretch) as a release for linux jails
 2021-07-23 15:53:24 -06:00
Christer Edwards 7c8c324a17 Merge pull request #426 from yaazkal/linux-bootstrap-functions 
Refactor: Creates Linux jails bootstrap functions
 2021-07-23 10:46:40 -06:00