Commit Graph
100 Commits
Author SHA1 Message Date
Christer Edwards 3945e82213 Merge pull request #162 from JRGTH/master
code standardization/cleanup; import improvements
2020-02-21 19:45:12 -07:00
Christer Edwards a18927fb7a Merge pull request #164 from hackacad/bastille_export_fix
remove colon from filename
2020-02-21 07:30:22 -07:00
Christer Edwards 9481b6a1e6 Merge pull request #161 from JRGTH/master
Workaround  to combine options first, code cleanup/maintenance
2020-02-20 09:29:24 -07:00
Christer Edwards c6357127ea Merge pull request #160 from cedwards/quoting_fixes
properly quoting variables
2020-02-17 09:42:37 -07:00
Christer Edwards 950342f54e properly quoting variables 2020-02-17 09:41:33 -07:00
Christer Edwards f271547e23 Merge pull request #159 from cedwards/documentation
basic VNET example + devfs.rules
2020-02-16 15:44:20 -07:00
Christer Edwards c4ede0a829 basic VNET example + devfs.rules 2020-02-16 15:43:13 -07:00
Christer Edwards 64a4dd5987 Merge pull request #158 from cedwards/vnet_initial
Ability to create VNET containers
2020-02-16 15:28:13 -07:00
Christer Edwards 814dc6d926 properly set ip6 mode 2020-02-16 15:22:32 -07:00
Christer Edwards 273acb6e50 initial support to create vnet container 2020-02-16 15:20:31 -07:00
Christer Edwards 099c45422d Merge pull request #156 from cedwards/ip6_README
update README with ip6 example
2020-02-16 14:24:10 -07:00
Christer Edwards 863c3cacc5 update README with ip6 example 2020-02-16 14:23:05 -07:00
Christer Edwards b1380b30e5 Merge pull request #154 from JRGTH/master
Initial IPv6 support
2020-02-16 10:26:08 -07:00
Christer Edwards 32ddcd5439 Merge pull request #153 from cedwards/edit_fixes
fixes for new edit sub-command; supports stopped as it should
2020-02-16 09:57:49 -07:00
Christer Edwards 26846d510e fixes for new edit sub-command; supports stopped as it should 2020-02-16 09:56:04 -07:00
Christer Edwards 44989660d2 Merge pull request #152 from JRGTH/master
Ignore IPv4 check if there is no entry at all
2020-02-15 13:43:44 -07:00
Christer Edwards 0e39f7cabb Merge pull request #151 from JRGTH/master
Return proper warning messages, code cleanup
2020-02-14 08:46:18 -07:00
Christer Edwards ee81a73264 Merge pull request #148 from hackacad/Makefile_bastilleconf
make deinstall: avoid removing bastille.conf
2020-02-13 06:58:05 -07:00
Christer Edwards d667f93bc5 Merge pull request #147 from cedwards/edit_jail_files
ability to edit TARGET files (jail.conf, fstab, etc)
2020-02-12 16:48:46 -07:00
Christer Edwards 1e2bbcd3b7 Merge pull request #146 from JRGTH/master
Cleanup unused code, display related platform OS while bootstrapping …
2020-02-12 16:47:51 -07:00
Christer Edwards e3492d4087 ability to edit TARGET files (jail.conf, fstab, etc) 2020-02-10 10:42:09 -07:00
Christer Edwards 7b706f83f4 Merge pull request #144 from cedwards/0_6_release_prep
preparation for 0.6x initial release
2020-02-05 19:04:23 -07:00
Christer Edwards 62c77b4e71 preparation for 0.6x initial release 2020-02-05 19:02:19 -07:00
Christer Edwards 488b6b614b Merge pull request #142 from hackacad/man_page_0.6
update man page for 0.6
2020-02-05 12:35:54 -07:00
Christer Edwards e6fb8ba45f Merge pull request #143 from JRGTH/master
Code improvements, use awk for exact match
2020-02-05 12:25:36 -07:00
Christer Edwards 9a1b673721 Merge pull request #141 from cedwards/fixes
Few fixes
2020-02-04 14:54:10 -07:00
Christer Edwards 11d7524446 checks needs to run before jail starts 2020-02-04 14:52:19 -07:00
Christer Edwards b1e44e39ce add missing fi 2020-02-04 14:51:59 -07:00
Christer Edwards 70eb3e6aa2 Merge pull request #139 from JRGTH/master
Compare/update fstab if both variables are set
2020-02-04 13:01:13 -07:00
Christer Edwards 7e43c10281 Merge pull request #138 from hackacad/ip_check
Check if IP address is in use
2020-02-04 09:38:26 -07:00
Christer Edwards 210a4f5018 Merge pull request #137 from hackacad/moveconfigfilesample
move bastille.config file to bastille.config.sample
2020-02-04 06:47:21 -07:00
Christer Edwards f61c530265 Merge pull request #121 from JRGTH/master
Add HardenedBSD CURRENT and LATEST download options, and code improve…
2020-02-02 20:52:07 -07:00
Christer Edwards 031a23400e Merge pull request #122 from cedwards/doc_updates
preparing docs for 0.6.x release
2020-02-02 14:00:35 -07:00
Christer Edwards 830de68bf9 preparing docs for 0.6.x release 2020-02-02 13:56:02 -07:00
Christer Edwards 503f787d69 Merge pull request #119 from paulc/master
Add support for dynamic redirection of host/container ports
2020-02-01 18:11:48 -07:00
Christer Edwards f5ddc434a3 Merge pull request #118 from cedwards/115-Makefile-fix
reverting Makefile; resolves #115
2020-02-01 09:08:40 -07:00
Christer Edwards 56f2f9afb6 reverting mkdir; resolves #115 2020-02-01 09:05:29 -07:00
Christer Edwards eb38963752 Merge pull request #113 from cedwards/little_fixes
Minor fixes to create and import
2020-01-28 17:41:59 -07:00
Christer Edwards 97417b5b4f updating import usage output 2020-01-28 17:36:30 -07:00
Christer Edwards 2cfcc4b8ad simplify variable usage in interface validation 2020-01-28 17:36:17 -07:00
Christer Edwards d9d52f09e3 Merge pull request #109 from JRGTH/master
Initial support for container export and import
2020-01-28 17:17:19 -07:00
Christer Edwards 08d9449f42 Merge branch 'master' into master 2020-01-28 16:05:23 -07:00
Christer Edwards 19e1cbf0fe Merge pull request #112 from hackacad/master
bootstrap_urls in bastille.conf
2020-01-28 09:31:41 -07:00
Christer Edwards af15a39160 Merge pull request #108 from cedwards/documentation
updating template docs to include limits support
2020-01-26 12:46:01 -07:00
Christer Edwards a60c678036 updating template docs to include limits 2020-01-26 12:43:45 -07:00
Christer Edwards 7c5436c740 Merge pull request #107 from cedwards/list_update
support listing currently enabled container resource limits
2020-01-26 11:49:44 -07:00
Christer Edwards 27393f8db4 support listing current defined container resource limits 2020-01-26 11:48:21 -07:00
Christer Edwards 9917550093 Merge pull request #106 from cedwards/template_support_limits
add/remove rctl limits on container start/stop
2020-01-26 10:10:36 -07:00
Christer Edwards 02d0e94ef6 add/remove rctl limits on container start/stop 2020-01-26 10:08:42 -07:00
Christer Edwards 49c60f9896 Merge pull request #105 from cedwards/template_support_limits
Initial support for LIMITS in template automation
2020-01-26 09:56:48 -07:00
Christer Edwards 8b9760b0a5 initial support for limits automation; updated copyright year 2020-01-26 09:51:02 -07:00
Christer Edwards 798d182e21 Merge pull request #104 from jpmens/patch-3
remove duplicate entry in sub-command list
2020-01-26 07:30:12 -07:00
Christer Edwards 04303353f2 Merge pull request #103 from jpmens/patch-2
make escaped quote visible
2020-01-26 07:29:50 -07:00
Christer Edwards 0940d86d62 Merge pull request #96 from hackacad/master
initial man page
2020-01-19 19:15:12 -07:00
Christer Edwards b16d32e673 Merge pull request #97 from JRGTH/master
Add support for thinjail to thickjail conversion, minor code fixes
2020-01-19 19:14:21 -07:00
Christer Edwards 19a838921f Merge pull request #95 from bsdlme/master
use find + sed if `tree` not installed
2020-01-15 09:54:18 -07:00
Christer Edwards a6b4ede0fa updating contributors 2020-01-15 09:21:29 -07:00
Christer Edwards 4ce6b41c7c Merge pull request #94 from skunkwerks/master
build: fix manual install path
2020-01-15 08:12:18 -07:00
Christer Edwards 65855ecd80 Merge pull request #92 from cedwards/cedwards_fstab
cedwards FSTAB template hook
2020-01-12 07:47:26 -07:00
Christer Edwards ab67cb82d0 fixing README ver (for now) 2020-01-12 07:33:24 -07:00
Christer Edwards edc6308001 Initial working FSTAB hook and documentation 2020-01-12 07:32:10 -07:00
Christer Edwards 9778a24870 Merge pull request #89 from JRGTH/master
Minor changes, fix notify if container not started
2020-01-08 13:31:34 -07:00
Christer Edwards 9421cc59a0 Merge pull request #88 from JRGTH/master
Fix to match exact container name, add missing quotes
2019-12-27 10:43:07 -07:00
Christer Edwards de1590d709 Merge pull request #86 from hackacad/master
support for ressource limits; small Makefile improvemts
2019-12-26 08:58:17 -07:00
Christer Edwards ff9313a2ca Merge pull request #85 from JRGTH/master
Improved container update process, add support for Thickjail updates
2019-12-26 08:57:31 -07:00
Christer Edwards eb13d48eac Merge pull request #84 from briandowns/master
Add JSON output for list command
2019-12-18 18:04:23 -07:00
Christer Edwards d95d815949 Merge pull request #79 from JRGTH/master
Minor code cleanup/formatting
2019-12-12 20:41:22 -08:00
Christer Edwards 0fd6cd0fd9 Merge pull request #81 from bsdlme/patch-1
Add more examples to service documentation
2019-12-12 20:39:34 -08:00
Christer Edwards 4a1e769036 Merge pull request #82 from bsdlme/master
Add "" around variables in test(1) cases to prevent errors when a variable is empty
2019-12-12 20:38:27 -08:00
Christer Edwards 3f7573825d Merge pull request #78 from cedwards/template_work
template validation improvements
2019-12-07 17:57:03 -07:00
Christer Edwards 265b8480e1 support for local templates and stricter validation 2019-12-07 17:48:39 -07:00
Christer Edwards abbec0652d clarifying template docs 2019-12-07 17:48:06 -07:00
Christer Edwards 1608d7f226 Merge pull request #76 from JRGTH/master
Added support for:
- HardenedBSD new link structure
- basic mirror support
- console user validation
2019-12-07 16:53:43 -07:00
Christer Edwards 29565b22c8 Merge pull request #75 from cedwards/firewall
0.5.20191128 release
2019-11-28 09:23:13 -07:00
Christer Edwards 8414865355 0.5.20191128 release 2019-11-28 09:21:13 -07:00
Christer Edwards 90c0c1d4c0 Merge pull request #74 from cedwards/improvements
updating version string
2019-11-25 21:44:55 -07:00
Christer Edwards 80412679a7 updating version string 2019-11-25 21:44:23 -07:00
Christer Edwards 61eb7f5625 Merge pull request #73 from cedwards/improvements
quieting pfctl output in start/stop
2019-11-25 17:46:00 -07:00
Christer Edwards fbb99470ec quieting pfctl output in start/stop 2019-11-25 17:45:17 -07:00
Christer Edwards f2a968a065 Merge pull request #71 from cedwards/improvements
Improvements to firewalling for loopback containers
2019-11-25 17:13:32 -07:00
Christer Edwards 0a708c3dc7 clarification to README on firewall settings 2019-11-25 17:12:27 -07:00
Christer Edwards f6653a6a48 Merge pull request #72 from JRGTH/master
Additional network config checks
2019-11-25 17:07:46 -07:00
Christer Edwards f36744f2a0 accidentally a word 2019-11-25 15:41:11 -07:00
Christer Edwards 43da7b25a1 standardizing comments 2019-11-25 15:40:10 -07:00
Christer Edwards b5c8330502 add PATH; improve firewall 2019-11-25 15:38:40 -07:00
Christer Edwards e4c4d0df2e Merge pull request #70 from cedwards/RC-test
regression in not using full path to bastille
2019-11-25 08:11:01 -07:00
Christer Edwards 7668927f6d regression in not using full path to bastille 2019-11-25 08:10:29 -07:00
Christer Edwards 635ce83d20 Merge pull request #69 from cedwards/RC-test
updated docs to reflect latest version
2019-11-24 21:04:59 -07:00
Christer Edwards 62b295f009 updated docs to reflect latest version 2019-11-24 21:04:19 -07:00
Christer Edwards a8d6fe41d3 Merge pull request #68 from cedwards/RC-test
bastille0 bootstrap commands out of order
2019-11-23 16:02:26 -07:00
Christer Edwards 806654eae0 bastille0 bootstrap commands out of order 2019-11-23 16:01:52 -07:00
Christer Edwards f892bab1b2 Merge pull request #67 from cedwards/RC-test
minor updates to README
2019-11-23 13:52:13 -07:00
Christer Edwards 8409c356a8 minor updates to README 2019-11-23 13:50:55 -07:00
Christer Edwards 864cfd31b8 Merge pull request #66 from cedwards/RC-test
minor fixes discovered during 0.5.20191125 RC
2019-11-23 12:58:39 -07:00
Christer Edwards 4c6acc5b17 minor fixes discovered during 0.5.20191125 RC 2019-11-23 12:56:21 -07:00
Christer Edwards 77114ba818 Merge pull request #65 from cedwards/RC-test
0.5.20191125 RC fixes and formatting
2019-11-22 22:11:53 -07:00
Christer Edwards 5d2954feb9 updating Usage output and standardizing target variable 2019-11-22 22:07:14 -07:00
Christer Edwards cd4f9ee22e updating Usage output and standardizing target variable 2019-11-22 22:06:50 -07:00
Christer Edwards 3ee2af3b03 updating variable and quoting for coding standards 2019-11-22 22:06:34 -07:00
Christer Edwards a14d9cffdd updating Usage output and standardizing target variable 2019-11-22 22:05:53 -07:00