Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge bastille #3

Open
wants to merge 126 commits into
base: master
Choose a base branch
from
Open

Merge bastille #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
124902d
Added zfs_destroy_snapshot functionality
Dec 27, 2022
9a00ae5
Added git endpoint for bastille bootstrap
mayakerostasia Jan 16, 2023
5adc75a
Clean up the git template name by removing .git from the end - this l…
mayakerostasia Jan 16, 2023
9588d52
Merge pull request #566 from nwisemanII/SSHIdentBootstrap
cedwards Jan 16, 2023
3f665e4
Rename command now affects name of created vnet interfaces
Feb 15, 2023
c016bc0
Blank line removal
Feb 15, 2023
5c84731
Merge pull request #572 from UrsusDominatus/rename_command_vnet_inter…
cedwards Feb 15, 2023
5c94c28
Merge pull request #564 from Efiartes/zfs_destroy_snapshot
cedwards Feb 15, 2023
34669ce
Fix link
drbrain Feb 25, 2023
7b63059
Merge pull request #573 from drbrain/patch-1
cedwards Feb 25, 2023
b60bc10
Add rcp (reverse copy) command
NikosChondros Mar 4, 2023
09a1d30
Add "bastille tags" subcommand to add tag strings to jails
Mar 14, 2023
c94f653
Refactor
Mar 14, 2023
91d1768
Add "tags" subcommand
Mar 14, 2023
10d9466
Re-work "list" command / output and add "search" command.
Mar 15, 2023
6776427
Drop "search" in favor of "list"
Mar 16, 2023
64c3b60
Allow running bastille and subcomands with help flags as regular user
Mar 16, 2023
5aa98a8
Merge pull request #578 from bsdlme/master
cedwards Mar 23, 2023
f936afe
Sort bastille usage ouput and update README.md for newer FreeBSD
Mar 23, 2023
a9d8ae2
Merge branch 'BastilleBSD:master' into master
bsdlme Mar 23, 2023
2e2032f
Merge pull request #579 from bsdlme/master
cedwards Mar 24, 2023
bf6fbed
add ipv6 rdr support
android-ucet Mar 28, 2023
d7609c2
Merge pull request #580 from android-ucet/patch-1
cedwards Mar 28, 2023
2284200
Updates to the hardenedbsd installer URLs for bootstrapping releases.
shirkdog Apr 5, 2023
be50bd2
Update to default conf
shirkdog Apr 5, 2023
c760b81
Merge pull request #581 from shirkdog/master
cedwards Apr 5, 2023
8f803d5
Fix missing version
JRGTH May 1, 2023
6ec7ae9
Merge pull request #585 from JRGTH/add_version
cedwards May 1, 2023
2e583cf
Add missing spaces for consistency
JRGTH May 2, 2023
cb84068
Merge pull request #586 from JRGTH/create_fixes
cedwards May 2, 2023
e454f1c
list cmd enhancement
JRGTH May 3, 2023
0b7ed78
[FIX] Support `ALL` in `pkg` command when using the -H or --host option.
yaazkal May 10, 2023
bc9f4d7
Merge pull request #588 from yaazkal/all-target-fix
cedwards May 12, 2023
a0140e1
Added initial upgrading documentation.
tobiastom May 24, 2023
72b8000
fix rdr issue detecting IP6 when disabled or not set
cedwards Jun 22, 2023
e64a6af
Merge pull request #592 from BastilleBSD/rdr_fix
cedwards Jun 22, 2023
4891ce6
Update bootstrap.sh
gqgunhed Jul 10, 2023
16fae72
Added Ubuntu Jammy 22.04 LTS
gqgunhed Jul 10, 2023
a89f422
Added ubuntu-jammy and bookworm releases
gqgunhed Jul 10, 2023
bea80db
Exchanged entry for Debian9 with Debian12
gqgunhed Jul 10, 2023
8d16399
Added NAME_VERIFY=Ubuntu_2204 section
gqgunhed Jul 10, 2023
cf569ea
Updated supported Linux releases
gqgunhed Jul 10, 2023
6e78be2
added focal+jammy to Apt::Cache-Start
gqgunhed Jul 10, 2023
373ccd4
changed the occurence of path /etc/pf.conf in the rdr.sh script for r…
skenizen Jul 12, 2023
7f41973
Merge pull request #595 from skenizen/fix-rdr-pf-path
cedwards Jul 14, 2023
a406654
Merge pull request #593 from gqgunhed/gqgunhed-linux-releases
cedwards Jul 14, 2023
15c43ee
Merge pull request #590 from tobiastom/feature/upgrade-documentation
cedwards Jul 14, 2023
a2e1bef
Merge pull request #587 from JRGTH/list_cmd_update
cedwards Jul 14, 2023
4efcc50
update copyright dates
cedwards Jul 15, 2023
15f2ea8
Merge branch 'master' of https://github.com/bastillebsd/bastille into…
cedwards Jul 15, 2023
e15a481
setup now references bastille_pf_conf variable
cedwards Jul 15, 2023
2fd1f2c
update versions and dates
cedwards Jul 15, 2023
3ea5530
source bastille.conf for pf path support
cedwards Jul 15, 2023
61e7084
Merge pull request #596 from cedwards/2023_release
cedwards Jul 15, 2023
72bd211
Validate jib during jail import
JRGTH Jul 19, 2023
d6b5733
Add rdr pf conf check
JRGTH Sep 7, 2023
9fc8804
Update bastille.conf.sample
JRGTH Sep 7, 2023
aa688f7
Update upgrade.sh
tub5ta Sep 19, 2023
3355c07
rdr disable directive fix
Oct 4, 2023
6be0f23
Merge pull request #610 from BastilleBSD/rdr_fix
cedwards Oct 4, 2023
40e4b81
prep & cleanup for 0.10.20231013 release
cedwards Oct 11, 2023
a0d6d58
Merge pull request #611 from BastilleBSD/20231013_release
cedwards Oct 17, 2023
848be8d
Merge pull request #606 from JRGTH/config_update
cedwards Oct 18, 2023
e078aed
Merge pull request #608 from tub5ta/patch-1
bmac2 Oct 18, 2023
f35de69
Merge pull request #605 from JRGTH/rdr_fixes
bmac2 Oct 18, 2023
91f479e
Merge pull request #598 from JRGTH/import_enhancements
bmac2 Oct 18, 2023
721a5ca
fix for JID instead of jail name in list printout
Oct 19, 2023
27e88d4
Merge pull request #612 from BastilleBSD/JID-fix
bmac2 Oct 19, 2023
e7eb9b7
fix-issue-601
tucoinfo Oct 19, 2023
2c932cf
Merge pull request #613 from tucoinfo/patch-1
bmac2 Oct 19, 2023
b76df46
vnet bridging definitions
Oct 21, 2023
0a93940
CIDR documentation on create command
Oct 21, 2023
ca2b75e
added iocage migration doc
Oct 21, 2023
864d8d0
Update template.rst
tucoinfo Oct 25, 2023
4bebca9
Merge pull request #617 from tucoinfo/patch-2
cedwards Oct 25, 2023
fe31dbd
Merge pull request #614 from BastilleBSD/vnet-bridge
cedwards Oct 25, 2023
b0ba336
documented .hushlogin and uname in jails
Oct 26, 2023
8b38497
documentation of uname and MOTD & hushlogin
Oct 26, 2023
440b243
update filenames
Oct 26, 2023
10fe9df
Merge pull request #616 from BastilleBSD/issue-527
bmac2 Oct 26, 2023
4ea6f00
Merge branch 'master' into issue-393
bmac2 Oct 26, 2023
00d5c97
Merge pull request #619 from BastilleBSD/issue-393
bmac2 Oct 26, 2023
445b42e
Merge branch 'master' into master
NikosChondros Oct 26, 2023
0354baa
Merge pull request #575 from NikosChondros/master
bmac2 Oct 26, 2023
3ac2921
documenting the use of ports in a template
Oct 26, 2023
22b3c3c
Merge pull request #620 from BastilleBSD/issue-157
bmac2 Oct 26, 2023
01ee385
upgrading documentation
Oct 27, 2023
bf98acd
upgrading documentation try2
Oct 27, 2023
78c77b7
Merge pull request #622 from BastilleBSD/updatejail
bmac2 Oct 27, 2023
1136723
Update setup.sh
adriel-tech Oct 29, 2023
cf928f1
Fix generated interface name in rc.conf for vnet jail
Oct 30, 2023
49f6402
Merge pull request #624 from majsterkoo/vnet_rename_fix
bmac2 Oct 30, 2023
df00a79
Merge pull request #623 from adriel-tech/patch-1
bmac2 Nov 1, 2023
1e849d4
resolving to use /24 in docs
Nov 1, 2023
b7d741b
Merge pull request #615 from BastilleBSD/issue-399
bmac2 Nov 1, 2023
157125c
Relax validation of -BETA / -RC releases
smortex Nov 10, 2023
8c04f1d
Merge pull request #628 from smortex/relax-beta-rc-validation
cedwards Nov 10, 2023
a38403b
rcorder(8)-ed startup script
dsh2dsh Nov 11, 2023
2b6eb3c
Added note on updating bastille.conf when upgrading
Nov 13, 2023
9e71332
Merge pull request #630 from brendans-bits/readme-upgrading
cedwards Nov 14, 2023
ace7bdc
add osrelease to jail.conf for new jails
cedwards Nov 19, 2023
2de0766
Merge pull request #632 from BastilleBSD/osrelease_patch
cedwards Nov 19, 2023
51f9003
Merge pull request #629 from dsh2dsh/rcordered
cedwards Nov 20, 2023
8906e49
initial support & docs to bootstrap EOL releases
cedwards Nov 20, 2023
c8b3fb3
Merge pull request #633 from BastilleBSD/eol_patch
cedwards Nov 20, 2023
dc6e755
fix readthedocs build info
cedwards Nov 21, 2023
d0ff970
Merge pull request #634 from BastilleBSD/readthedocs
cedwards Nov 21, 2023
9465635
fix more readthedocs build info
cedwards Nov 21, 2023
c2b17f3
Merge pull request #635 from BastilleBSD/readthedocs
cedwards Nov 21, 2023
d44c856
update documentation for 14.0-RELEASE
cedwards Nov 24, 2023
620ad46
Merge pull request #637 from BastilleBSD/20231125_prep
cedwards Nov 24, 2023
3df3907
support combining options for bastille create
cedwards Nov 24, 2023
97a0e69
standardize options in create matrix
cedwards Nov 24, 2023
b05493b
Merge pull request #638 from BastilleBSD/create_matrix
cedwards Nov 24, 2023
622c926
support lowercase values in bastille.conf (issue #368)
cedwards Nov 25, 2023
86cb374
Merge pull request #639 from BastilleBSD/support_lowercase
cedwards Nov 25, 2023
b30a748
fix for recent EOL support patch
cedwards Nov 26, 2023
32d67ae
Merge pull request #640 from BastilleBSD/eol_patch
cedwards Nov 26, 2023
dd60e7f
add support for bastille_vnet devfs.rules in bastille setup
cedwards Nov 26, 2023
bce28bf
Merge pull request #641 from BastilleBSD/setup_vnet
cedwards Nov 26, 2023
c627b1f
fix logic for rc.conf + bastille.conf ZFS check
cedwards Nov 26, 2023
3a4ebc6
Merge pull request #642 from BastilleBSD/support_lowercase
cedwards Nov 26, 2023
83d58db
fix conflict
materialofmouse Mar 4, 2024
c082cb6
とりあえずcreate動くようにした
materialofmouse Mar 4, 2024
9784ccd
add destro
materialofmouse Nov 22, 2024
8cd4ad0
add custom rootfs support
materialofmouse Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .readthedocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
sphinx:
configuration: docs/conf.py

python:
version: 3.7
install:
- requirements: docs/requirements.txt
build:
os: "ubuntu-22.04"
tools:
python: "3.11"
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2018-2022, Christer Edwards <[email protected]>
Copyright (c) 2018-2023, Christer Edwards <[email protected]>
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
Loading