BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity
785 Commits 13 Branches 34 Tags
b7914ba67abf94581b3f70ae2df0187e996e5d7e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christer Edwards e99fc5de6c Merge pull request #425 from yaazkal/patch-3 
Fix minor typo in README
 2021-07-23 10:44:38 -06:00
Christer Edwards 93bb9a5048 Merge pull request #422 from cynix/fix_linux_jail 
Fix creation of Linux jails
 2021-07-15 07:25:31 -06:00
Christer Edwards cc60df5cec Merge pull request #421 from cedwards/bastille-day-2021-release-prep 
release preparation for 0.9.x
 2021-07-14 16:09:25 -06:00
Christer Edwards 8ecded5cdb update README for new release 2021-07-14 16:00:13 -06:00
Christer Edwards 6d5da561bd release preparation for 0.9.x 2021-07-14 15:49:12 -06:00
Christer Edwards c6491710fc Merge pull request #419 from JRGTH/master 
Code review/cleanup routine
 2021-07-14 14:18:32 -06:00
Christer Edwards fb74bcb047 Merge pull request #418 from cedwards/fix-410-cmd-use-jail-env 
fix issue #410 so CMD properly uses jailed env (root)
 2021-07-13 21:39:14 -06:00
Christer Edwards 43a33739a3 fix issue #410 so CMD properly uses jailed env (root) 2021-07-13 21:38:03 -06:00
Christer Edwards 4d75ee6b2b Merge pull request #415 from JRGTH/master 
Revision for create cmd and cleanup, fixed regressions and enhanced usage
 2021-07-13 20:58:38 -06:00
Christer Edwards eeecffa93a Merge pull request #417 from cedwards/docs_quickfix 
documentation fix for pkg (remove quotes)
 2021-07-12 19:11:46 -06:00
Christer Edwards 4eb95f18ee documentation fix for pkg (remove quotes) 2021-07-12 19:10:33 -06:00
Christer Edwards 8005dd2081 Merge pull request #414 from hackacad/linux_compat 
Fix VNET issue causes by Linux compat
 2021-07-12 08:14:35 -06:00
Christer Edwards 6977a42432 Merge pull request #411 from JRGTH/master 
New features and improvements re-revised/re-tested for upcoming release
 2021-07-11 19:12:12 -06:00
Christer Edwards f8b50561ec Merge pull request #413 from hackacad/posix 
fix list.sh for BSD grep
 2021-07-11 14:34:10 -06:00
Christer Edwards b997be51ae Merge pull request #340 from hackacad/linux_compat 
Linux compat RC1
 2021-07-11 14:31:29 -06:00
Christer Edwards 9f8b2514b3 Merge pull request #394 from adyxax/network-access-on-startup 
Fixes #338 Network access on jail startup
 2021-07-04 08:48:59 -06:00
Christer Edwards ada9352e1f Merge pull request #384 from gtz42/master 
Don't include jail path twice
 2021-07-04 08:41:03 -06:00
Christer Edwards 091a0f336c Merge pull request #390 from aeifn/master 
Lint bootstrap.sh
 2021-07-04 08:40:11 -06:00
Christer Edwards b85d6347de Merge pull request #380 from noracenofun/master 
fixed displaying issue
 2021-05-25 07:13:08 -06:00
Christer Edwards 91aee11b54 Merge pull request #381 from hackacad/open_templates 
allow alternative template servers
 2021-05-25 07:12:09 -06:00
Christer Edwards 814201fa9f Merge pull request #379 from noracenofun/fixes-issue-#361 
fixes issue #361
 2021-05-05 13:02:45 -06:00
Christer Edwards 9a0d01da74 Merge pull request #305 from hackacad/thick_upgrade 
Thick Upgrade
 2021-05-04 19:04:29 -06:00
Christer Edwards a311379afa Merge pull request #357 from ddowse/master 
Help output to show real value for options instead of just [options]
 2021-05-04 19:02:14 -06:00
Christer Edwards c37006ec69 Merge pull request #376 from noracenofun/new-list-option 
added the new option -a (aka all, --all) for list
 2021-05-04 18:57:21 -06:00
Christer Edwards e7c6149d5a Merge pull request #370 from hackacad/rc3-4 
add RC3/4 support
 2021-04-03 10:07:43 -06:00
Christer Edwards d6d9d14820 Merge pull request #355 from laffer1/master 
Add preliminary support for MidnightBSD.
 2021-03-22 13:56:58 -06:00
Christer Edwards f8489beea5 Merge pull request #359 from ddowse/issue-358 
Issue 358 - wrong gw selection
 2021-03-22 13:54:13 -06:00
Christer Edwards f02743fbd8 Merge pull request #362 from hackacad/ipv6_pf 
IPv6 rules in pf.conf
 2021-03-22 13:53:24 -06:00
Christer Edwards d9283b44b2 Merge pull request #363 from hackacad/fstab_fix 
Warn if fstab exists
 2021-03-22 13:52:58 -06:00
Christer Edwards 2e5d5b4be1 Merge pull request #356 from cedwards/default-template-fix 
revert default template link; error->notify for bootstrap
 2021-02-28 13:10:13 -07:00
Christer Edwards 3fe03807ef Merge pull request #350 from zilti/master 
Added option to have CP be quiet
 2021-02-23 09:51:28 -07:00
Christer Edwards c7a84a4a4e Merge pull request #351 from tuffnatty/patch-1 
Reflect bastille_zfs_mountpoint deprecation in README.md
 2021-02-19 09:52:40 -07:00
Christer Edwards f7ef58cc19 Merge pull request #344 from hackacad/include_beta 
allow boostrapping BETA build
 2021-02-15 13:33:43 -07:00
Christer Edwards af8d766b0e Merge pull request #333 from BastilleBSD/issue-332 
fixes issue #332
 2021-01-29 12:32:33 -07:00
Christer Edwards ec24d7a897 Merge pull request #329 from BastilleBSD/docs-fix 
minor fixes to previous doc updates
 2021-01-27 13:55:12 -07:00
Christer Edwards 4b27614ad7 Merge pull request #328 from BastilleBSD/docs-fix 
fix formatting in network documentation
 2021-01-27 13:49:50 -07:00
Christer Edwards b5f1f15c45 Merge pull request #327 from fbarthez/patch-1 
Minor md syntax fixes, adding missing spaces
 2021-01-27 13:39:47 -07:00
Christer Edwards 584839fd78 Merge pull request #319 from hackacad/pf_keep 
Update README / pf.conf
 2021-01-19 12:59:08 -07:00
Christer Edwards 113beb54e7 Merge pull request #317 from cedwards/release-prep-20210115 
version bump for 0.8.20210115
 2021-01-15 20:31:11 -07:00
Christer Edwards 2c5fff7ec7 version bump for 0.8.20210115 2021-01-15 20:28:34 -07:00
Christer Edwards ae5feaa3df Merge pull request #316 from cedwards/2021-updates 
update 2021 copyright
 2021-01-15 20:11:04 -07:00
Christer Edwards 6fa744bbda update 2021 copyright 2021-01-15 20:00:26 -07:00
Christer Edwards 5b8fcf5a4d Merge pull request #311 from JRGTH/master 
Don't start empty jails, don't apply template if Bastillefile is empty
 2021-01-15 19:51:40 -07:00
Christer Edwards 49e24c9ec9 Merge pull request #313 from cedwards/rdr-standardization 
rdr now persists rules by default; rdr.sh cleanup
 2021-01-14 19:16:35 -07:00
Christer Edwards 110346f9f7 Merge pull request #312 from yaazkal/patch-2 
export: Clarifies that UFS jails must be stopped
 2021-01-08 17:13:23 -07:00
Christer Edwards 4824d95d68 Merge pull request #307 from cedwards/rdr-fix-20210101 
fix %s->%d regression
 2021-01-05 18:30:46 -07:00
Christer Edwards cc870b2667 fix %s->%d regression 2021-01-05 18:24:02 -07:00
Christer Edwards 67362ff309 Merge pull request #306 from cedwards/rdr-fix-20210101 
add required 'pass' to rdr rules
 2021-01-05 18:07:05 -07:00
Christer Edwards 6f043d62e5 add required 'pass' to rdr rules 2021-01-05 18:00:28 -07:00
Christer Edwards 7c271df2f5 Merge pull request #301 from cedwards/release-prep-20210101 
version bumps for release preparation
 2021-01-01 09:32:55 -07:00
Christer Edwards c9b02fa1dd Merge pull request #302 from cedwards/vnet-checks 
adding a couple vnet exceptions for ip4.addr checks
 2021-01-01 09:27:16 -07:00
Christer Edwards 4136f8fff4 Merge pull request #296 from chriswells0/require-interface 
Verify interface exists when starting jail.
 2020-12-31 15:00:46 -07:00
Christer Edwards 1120a0eebd Merge pull request #279 from chriswells0/default-templates 
Use templates for configuring new jails.
 2020-12-31 15:00:13 -07:00
Christer Edwards c337994414 Merge pull request #297 from hackacad/zfs_bootstrap 
Check if ZFS is enabled in rc.conf and bastille.conf
 2020-12-23 09:56:20 -07:00
Christer Edwards d9ee2e190d Merge pull request #298 from hackacad/stop_rdr 
stop.sh: clear rdr
 2020-12-23 09:55:32 -07:00
Christer Edwards 2e5811b1ee Merge pull request #294 from BastilleBSD/247-fix-documentation 
update devfs.rules documentation
 2020-12-13 11:14:27 -07:00
Christer Edwards 31dfa2bfba Merge pull request #293 from chriswells0/grep-fixes 
Fix grep when UTF-8 is not used.
 2020-12-13 09:10:36 -07:00