BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity
646 Commits 13 Branches 34 Tags
b997be51aef13104b924a0bf4bd82518177d662d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christer Edwards be6b1adfb9 Merge pull request #285 from chriswells0/hook-conversion 
Add ability to convert "hook" files to Bastillefile format.
 2020-12-12 12:05:35 -07:00
Christer Edwards 4e843be9e3 Merge pull request #276 from chriswells0/render-message 
Display message about file/directory being rendered.
 2020-12-12 11:55:04 -07:00
Christer Edwards 62c8060b53 Merge pull request #286 from chriswells0/document-limits 
Add missing subcommands (limits/config) to docs.
 2020-12-12 11:54:25 -07:00
Christer Edwards 01494ad3fd Merge pull request #289 from chriswells0/limits-fixes 
Update existing limit when a new value is provided.
 2020-12-12 11:54:05 -07:00
Christer Edwards 574f655cc8 Merge pull request #290 from andrewhotlab/master 
Respect exec.fib parameter in console command
 2020-12-12 11:53:38 -07:00
Christer Edwards 160040d2e9 Merge pull request #291 from JRGTH/master 
Update help usage on update command
 2020-12-12 11:52:46 -07:00
Christer Edwards 73c500ce3e Merge pull request #288 from chriswells0/config-fixes 
Properly escape config property and value.
 2020-12-12 11:52:04 -07:00
Christer Edwards 81ff4a3243 Merge pull request #287 from chriswells0/default-args 
Provide JAIL_NAME and JAIL_IP as default template args.
 2020-12-12 11:51:05 -07:00
Christer Edwards 7c134184c6 Merge pull request #292 from PetruGarstea/feature/rctl-logging 
log rctl events to /var/log/messages
 2020-12-12 11:48:07 -07:00
Christer Edwards b0c27329c9 Merge pull request #284 from chriswells0/stopped-jail-actions 
Fix bug preventing commands against stopped jails.
 2020-11-28 13:12:52 -07:00
Christer Edwards ce57d05081 Merge pull request #282 from chriswells0/zfs-case 
Use uppercase ZFS when appropriate.
 2020-11-28 11:05:09 -07:00
Christer Edwards 0a9ae633e3 Merge pull request #283 from chriswells0/edit-config 
Add 'config' command to get/set jail config properties.
 2020-11-28 11:01:13 -07:00
Christer Edwards a9ea02b743 Merge pull request #281 from tobiastom/patch-1 
Clarified the `RENDER` functionality.
 2020-11-27 10:10:25 -07:00
Christer Edwards 1ffa999f08 Merge pull request #278 from chriswells0/warn-function 
Create info() and warn() for cleaner print statements.
 2020-11-27 10:09:29 -07:00
Christer Edwards e1cda4ba15 Merge pull request #273 from JRGTH/master 
Upgrade thick jails from bastille
 2020-11-27 10:07:35 -07:00
Christer Edwards 8d3b83bd44 Merge pull request #277 from chriswells0/rdr-ranges 
Allow port ranges in RDR parameters.
 2020-11-26 07:54:18 -07:00
Christer Edwards 3c79e1d82b Merge pull request #267 from JRGTH/master 
Option to create standard backups on ZFS setups
 2020-11-10 13:10:22 -07:00
Christer Edwards 67d2fdcbbb Merge pull request #261 from cbaecker/non-bastille_vs_ALL 
Prevent acting on non-bastille jails when using target ALL
 2020-11-10 13:07:28 -07:00
Christer Edwards 2483fdd0f0 Merge pull request #255 from chriswells0/template-args 
Add support for template args
 2020-11-10 13:05:33 -07:00
Christer Edwards 5b096e82ed Merge pull request #269 from mattaudesse/normalize-template-sh-indentation 
Normalize indentation in usr/local/share/bastille/template.sh
 2020-10-23 07:31:09 -06:00
Christer Edwards 20b6f2ffe6 Merge pull request #268 from tobiastom/feature/persistent-rdr 
Make RDR rules persistent between bastille restarts.
 2020-10-19 09:08:52 -06:00
Christer Edwards 917b4d8d0b Merge pull request #266 from JRGTH/master 
Don't create or modify etc/fstab and etc/crontab on empty jail creation
 2020-10-15 11:48:59 -06:00
Christer Edwards 5e9e58dd92 Merge pull request #264 from bsdlme/patch-2 
Fix pass in rule comment for dynamic rdr
 2020-10-13 07:45:17 -06:00
Christer Edwards bf5fd4ef2a Merge pull request #258 from yaazkal/patch-1 
Update README.md clarifying pf config example
 2020-09-22 09:50:21 -06:00
Christer Edwards 5b36a9e762 Merge pull request #257 from chriswells0/rdr-typo 
Fix typo in rdr documentation
 2020-09-22 09:49:19 -06:00
Christer Edwards 5766d66078 Merge pull request #256 from chriswells0/dev-permissions 
Use root as owner when installing from Makefile
 2020-09-22 09:49:05 -06:00
Christer Edwards 935118fc99 Merge pull request #251 from chriswells0/require-running-jail 
Require target to be running for specific commands
 2020-09-22 09:48:28 -06:00
Christer Edwards 976aa077b6 Merge pull request #250 from chriswells0/error-functions 
Create and leverage global error functions
 2020-09-22 09:47:23 -06:00
Christer Edwards a4fcf0100b Merge pull request #249 from chriswells0/cp-alias-fix 
Map COPY alias in Bastillefile to use cp subcommand
 2020-08-30 20:24:59 -06:00
Christer Edwards 3c070bf908 Merge pull request #248 from cedwards/support-current 
initial support for X-current (dev) containers
 2020-08-28 14:32:54 -06:00
Christer Edwards a369ed399d initial support for X-current (dev) containers 2020-08-28 14:13:54 -06:00
Christer Edwards 0ce53f4c4e Merge pull request #246 from JRGTH/master 
Fix for bastille bootstrap + update command
 2020-08-27 13:33:37 -06:00
Christer Edwards 8b196ffaeb Merge pull request #231 from tobiastom/bugfix/templates 
Fixed the overlay command in Bastillefile
 2020-08-20 16:26:08 -06:00
Christer Edwards 7e27bcd36c Merge pull request #242 from tobiastom/feature/fstab-in-template 
Added fstab alias to mount command in Bastillefiles.
 2020-08-19 11:52:29 -06:00
Christer Edwards 3ebfb69305 Merge pull request #229 from JRGTH/master 
Initial alternate architecture fetch/create support
 2020-08-19 11:49:11 -06:00
Christer Edwards d09644dc23 Merge pull request #243 from tobiastom/feature/display-failed-command 
Use the correct variable to display the failed template command.
 2020-08-19 11:40:19 -06:00
Christer Edwards 388cb39607 Merge pull request #232 from hackacad/master 
limits needs 3 args
 2020-08-10 20:01:42 -06:00
Christer Edwards ad749e8a75 Merge pull request #236 from bmac2/master 
update to include Bastillefile as a valid HOOK in verify process
 2020-08-07 10:26:51 -06:00
Christer Edwards 5edf9cbe51 Merge pull request #224 from cedwards/update-20200714 
update to 0.7.20200714
 2020-07-13 21:49:31 -06:00
Christer Edwards 845bb9106f update to 0.7.20200714 2020-07-13 21:48:03 -06:00
Christer Edwards 9150da4a5f Merge pull request #223 from cedwards/docs_update-20200714 
update docs for 0.7.20200714 release
 2020-07-13 21:45:51 -06:00
Christer Edwards d3d4a9c030 updating subcommand index 2020-07-13 19:32:44 -06:00
Christer Edwards da15b4f59a update docs for 0.7.20200714 release 2020-07-13 19:27:23 -06:00
Christer Edwards 93bc945e90 Merge pull request #222 from cedwards/BUG-195 
update bastille log path
 2020-07-13 12:50:01 -06:00
Christer Edwards b9efa0ad04 update bastille log path 2020-07-10 08:18:21 -06:00
Christer Edwards 579cf76a38 Merge pull request #221 from JRGTH/master 
Force unmount any filesystems before jail rename, error handling
 2020-07-10 08:10:36 -06:00
Christer Edwards 328112c74e Merge pull request #218 from chriswells0/template-subcommands 
Execute template hooks using Bastille subcommands
 2020-07-10 08:10:16 -06:00
Christer Edwards af6f0064d6 Merge pull request #220 from cynix/fix_template_fstab 
Deduplicate template fstab entries using their full paths.
 2020-07-08 19:30:02 -06:00
Christer Edwards 99bd323897 Merge pull request #215 from JRGTH/master 
Option to force destroy jail in ZFS
 2020-06-19 08:45:36 -06:00
Christer Edwards 3fccba30d6 Merge pull request #216 from chriswells0/mount 
Add mount and umount commands to manage volumes inside containers.
 2020-06-19 08:44:18 -06:00
Christer Edwards 547aa27816 Merge pull request #213 from X86BSD/patch-1 
Clarify description of bastille_bootstrap_archives
 2020-06-19 08:43:21 -06:00
Christer Edwards e9c2a4d7b6 Merge pull request #209 from mariusvw/feature/vagrant 
Add vagrant support for testing
 2020-06-19 08:42:31 -06:00
Christer Edwards 8b00e0adf4 Merge pull request #217 from chriswells0/bastillefile 
Add Bastillefile support to templates.
 2020-06-19 08:42:03 -06:00
Christer Edwards 457e95a08b Merge pull request #219 from arrowd/patch-1 
clone cmd is listed twice, fix it
 2020-06-19 08:40:57 -06:00
Christer Edwards b515565bde Merge pull request #210 from mariusvw/feature/config-check 
Feature/config check
 2020-05-20 09:52:46 -06:00
Christer Edwards a28201f53e Merge pull request #207 from JRGTH/master 
Feature add, create empty jail and minor maintenance
 2020-05-20 09:51:16 -06:00
Christer Edwards 268008b967 Merge pull request #206 from JRGTH/master 
Fix for pfctl on start/stop commands, clean up excess double quotes
 2020-04-16 08:16:26 -06:00