Commit Graph

492 Commits

Author SHA1 Message Date
Chris Wells
cc513c3bed Allow port ranges in RDR parameters. 2020-11-25 20:29:15 -05: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
Chris Wells
2225f48f05 Add support for template args
Closes 211.
2020-10-30 16:05:06 -04: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
Matt Audesse
8bef2bfe63 Normalize indentation in usr/local/share/bastille/template.sh 2020-10-23 07:58:40 -04: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
Tobias Tom
7d78358f9f Make RDR rules persistent between bastille restarts. 2020-10-19 15:17:46 +01:00
Jose
855dcf3eae Fix to use SYNCDHCP by default while cloning jails 2020-10-17 17:34:25 -04:00
Jose
bc07ff2389 Export command bug fixes and enhancements 2020-10-16 14:48:36 -04:00
Jose
67a9c65912 Option to create standard backups on ZFS setups 2020-10-15 16:20:25 -04: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
Jose
ace6c9ab29 Don't create or modify etc/fstab and etc/crontab on empty jail creation 2020-10-15 13:18:55 -04: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
Lars E
2b9aa0ecd3 Fix pass in rule comment for dynamic rdr 2020-10-13 15:43:08 +02:00
Carsten BÃcker
0c5225571f Fix whitespace 2020-09-30 10:41:14 +00:00
Carsten BÃcker
9fd83714c8 Restrict to running jails 2020-09-30 10:36:58 +00:00
Carsten BÃcker
8725e9ccac Prevent acting on non-bastille jails when using target ALL 2020-09-30 09:05:44 +00: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
yaazkal
cbff4e326d Update README.md clarifying pf config example
Change the pf.conf example in order to prevent issues (jails not allowed to access internet correctly) when the network interface has IP aliases. Many thanks to @cedwards and @chriswells0 for the hints.
2020-09-18 17:53:05 -05:00
Chris Wells
3ca32fa1bc Fix typo in rdr documentation 2020-09-05 21:19:51 -04:00
Chris Wells
fddb762b45 Use root as owner when installing from Makefile 2020-09-05 21:15:01 -04: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
Chris Wells
c6aded8d0a Ensure target is specified and exists in 1 place instead of many.
Require target to be running for commands that need it.
Closes #239.
2020-08-30 20:15:22 -04:00
Chris Wells
aaffc882f9 Create and leverage global error functions 2020-08-30 10:57:14 -04:00
Chris Wells
94df833e6b Map COPY alias in Bastillefile to use cp subcommand 2020-08-29 19:22:26 -04: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
Jose
abd80b151f Fix for bastille bootstrap + update command 2020-08-26 14:47:27 -04: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
Tobias Tom
5a9034ff18 Added overlay command to be compatibile with the hooks. 2020-08-20 17:03:21 +01: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
Tobias Tom
1dd2280e2c Use the correct variable to display the failed template command. 2020-08-18 15:02:23 +01:00
Tobias Tom
14dbc09b7c Added fstab alias to mount command in Bastillefiles. 2020-08-18 14:58:19 +01: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
Barry McCormick
85176e35da update to include Bastillefile as a valid HOOK in verify process 2020-08-07 09:24:24 -07:00
Jose
a0b0eadc68 Display return status on bastille cp batch/loop 2020-07-31 08:51:47 -04:00
Jose
709f00a2ac Improve bastille/cp return status 2020-07-31 04:07:58 -04:00
hackacad
dc1b1f838a limits needs 3 args 2020-07-28 19:15:43 +02:00
Tobias Tom
24b4985371 Renamed cp command to overlay to match the documentation. 2020-07-27 15:06:19 +01:00
Jose
3872f93063 Post-creation jail misc configuration 2020-07-24 15:37:50 -04:00