diff --git a/LICENSE b/LICENSE index f0848e3..c8c6e40 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2018-2021, Christer Edwards +Copyright (c) 2018-2023, Christer Edwards All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md new file mode 100644 index 0000000..00972ba --- /dev/null +++ b/README.md @@ -0,0 +1,33 @@ +# Bastille Combined Templates + +## Status - Beta +This repository is a collection of Bastille templates all aggregated into +one place. This means you can add ALL the templates with one command. What's +more, the structure mimicks the FreeBSD ports tree. This means that you should +be able to find a template in a standard location to match any package origin. + +Code is being tested to support this new combined method alongside the existing +format. This means you can still use your existing custom templates while also +taking advantage of the new combined collection. + +This status will be removed once this new support has been added and merged. + +## Bootstrap +```shell +bastille bootstrap https://github.com/bastillebsd/templates +``` + +## Usage +```shell +bastille template TARGET [pkg/origin] +``` + +### Examples +``` +bastille template TARGET www/nginx +bastille template TARGET shells/zsh +bastille template TARGET lang/python311 +bastille template TARGET databases/mariadb1011-server +...etc... + +``` diff --git a/databases/mariadb-server/Bastillefile b/databases/mariadb-server/Bastillefile index 73c0917..d441065 100644 --- a/databases/mariadb-server/Bastillefile +++ b/databases/mariadb-server/Bastillefile @@ -1,3 +1,3 @@ -PKG mariadb105-server +PKG mariadb1011-server SYSRC mysql_enable=YES SERVICE mysql-server restart diff --git a/databases/mysql-server/Bastillefile b/databases/mysql-server/Bastillefile index dd1126e..2e02acb 100644 --- a/databases/mysql-server/Bastillefile +++ b/databases/mysql-server/Bastillefile @@ -1,3 +1,3 @@ -PKG mysql57-server +PKG mysql80-server SYSRC mysql_enable=YES SERVICE mysql-server restart diff --git a/databases/percona/Bastillefile b/databases/percona/Bastillefile deleted file mode 100644 index 22af3a9..0000000 --- a/databases/percona/Bastillefile +++ /dev/null @@ -1,3 +0,0 @@ -PKG percona57-server percona57-client -SYSRC mysql_enable=YES -SERVICE mysql-server start diff --git a/java/openjdk/Bastillefile b/java/openjdk/Bastillefile index de11905..ce49604 100644 --- a/java/openjdk/Bastillefile +++ b/java/openjdk/Bastillefile @@ -1 +1 @@ -PKG openjdk13 +PKG openjdk20 diff --git a/lang/go-devel/Bastillefile b/lang/go-devel/Bastillefile new file mode 100644 index 0000000..da6eaa2 --- /dev/null +++ b/lang/go-devel/Bastillefile @@ -0,0 +1 @@ +PKG go-devel diff --git a/lang/php/README.md b/lang/go-devel/README.md similarity index 55% rename from lang/php/README.md rename to lang/go-devel/README.md index 3e7f4b9..3b7eecf 100644 --- a/lang/php/README.md +++ b/lang/go-devel/README.md @@ -1,5 +1,5 @@ -# PHP -Bastille template to bootstrap PHP +## golang +Bastille template to bootstrap Go Devel ## Bootstrap ```shell @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET lang/php +bastille template TARGET lang/go-devel ``` diff --git a/lang/golang/Bastillefile b/lang/go/Bastillefile similarity index 100% rename from lang/golang/Bastillefile rename to lang/go/Bastillefile diff --git a/lang/golang/README.md b/lang/go/README.md similarity index 61% rename from lang/golang/README.md rename to lang/go/README.md index b5dbade..ad85bfe 100644 --- a/lang/golang/README.md +++ b/lang/go/README.md @@ -1,5 +1,5 @@ ## golang -Bastille template to bootstrap Golang +Bastille template to bootstrap Go ## Bootstrap ```shell @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET lang/golang +bastille template TARGET lang/go ``` diff --git a/lang/go119/Bastillefile b/lang/go119/Bastillefile new file mode 100644 index 0000000..3761231 --- /dev/null +++ b/lang/go119/Bastillefile @@ -0,0 +1 @@ +PKG go119 diff --git a/lang/perl/README.md b/lang/go119/README.md similarity index 55% rename from lang/perl/README.md rename to lang/go119/README.md index 87d72ad..8dc4fb1 100644 --- a/lang/perl/README.md +++ b/lang/go119/README.md @@ -1,5 +1,5 @@ -## perl -Bastille Template to bootstrap perl5-devel +## golang +Bastille template to bootstrap Golang 119 ## Bootstrap ```shell @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET lang/perl +bastille template TARGET lang/go119 ``` diff --git a/lang/go120/Bastillefile b/lang/go120/Bastillefile new file mode 100644 index 0000000..c4ad656 --- /dev/null +++ b/lang/go120/Bastillefile @@ -0,0 +1 @@ +PKG go120 diff --git a/lang/ruby/README.md b/lang/go120/README.md similarity index 56% rename from lang/ruby/README.md rename to lang/go120/README.md index f30da24..d4a043a 100644 --- a/lang/ruby/README.md +++ b/lang/go120/README.md @@ -1,5 +1,5 @@ -## ruby -Bastille template to bootstrap ruby +## golang +Bastille template to bootstrap Go 1.20 ## Bootstrap ```shell @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET lang/ruby +bastille template TARGET lang/go120 ``` diff --git a/lang/go121/Bastillefile b/lang/go121/Bastillefile new file mode 100644 index 0000000..b6dc1ba --- /dev/null +++ b/lang/go121/Bastillefile @@ -0,0 +1 @@ +PKG go121 diff --git a/databases/percona/README.md b/lang/go121/README.md similarity index 56% rename from databases/percona/README.md rename to lang/go121/README.md index 2641b1f..2758eab 100644 --- a/databases/percona/README.md +++ b/lang/go121/README.md @@ -1,5 +1,5 @@ -## percona -Bastille Template: percona +## golang +Bastille template to bootstrap Go 1.21 ## Bootstrap ```shell @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET databases/percona +bastille template TARGET lang/go121 ``` diff --git a/lang/perl/Bastillefile b/lang/perl/Bastillefile deleted file mode 100644 index 6408fe6..0000000 --- a/lang/perl/Bastillefile +++ /dev/null @@ -1 +0,0 @@ -PKG perl5-devel diff --git a/lang/php/Bastillefile b/lang/php/Bastillefile deleted file mode 100644 index 152ea31..0000000 --- a/lang/php/Bastillefile +++ /dev/null @@ -1,3 +0,0 @@ -PKG php74 -SYSRC php_fpm_enable=YES -SERVICE php-fpm start diff --git a/lang/python/Bastillefile b/lang/python/Bastillefile index f6c85fc..9bc1d30 100644 --- a/lang/python/Bastillefile +++ b/lang/python/Bastillefile @@ -1,2 +1,2 @@ -PKG python3 python +PKG python CMD python -VV diff --git a/lang/ruby/Bastillefile b/lang/ruby/Bastillefile deleted file mode 100644 index f3ea12e..0000000 --- a/lang/ruby/Bastillefile +++ /dev/null @@ -1 +0,0 @@ -PKG ruby diff --git a/net-mgmt/zabbix-agent/Bastillefile b/net-mgmt/zabbix-agent/Bastillefile deleted file mode 100644 index d5b51d1..0000000 --- a/net-mgmt/zabbix-agent/Bastillefile +++ /dev/null @@ -1,4 +0,0 @@ -PKG zabbix54-agent -CMD cp /usr/local/etc/zabbix54/zabbix_agentd.conf.sample /usr/local/etc/zabbix54/zabbix_agentd.conf -SYSRC zabbix_agentd_enable=YES -SERVICE zabbix_agentd start diff --git a/net-mgmt/zabbix-agent/README.md b/net-mgmt/zabbix-agent/README.md deleted file mode 100644 index 11cc013..0000000 --- a/net-mgmt/zabbix-agent/README.md +++ /dev/null @@ -1,28 +0,0 @@ -## Bootstrap -```shell -bastille bootstrap https://github.com/bastillebsd/templates -``` - -## Usage -```shell -bastille template TARGET bastillebsd-templates/zabbix-agent -``` - -## Post Install Steps - -Once this is done running there are a couple of manual steps you have to do. First edit the file - - /usr/local/etc/zabbix5/zabbix_agentd.conf - -and edit the following lines with your server ip/hostname, and your client's hostname: - - Server=1.1.1.1 - ServerActive=1.1.1.1 - Hostname=hostname.domain.tld - -then restart the zabbix agent: - -```shell -bastille service TARGET zabbix-agentd restart -``` -and at this point you can add this client to your zabbix server. diff --git a/net-mgmt/zabbix-server/Bastillefile b/net-mgmt/zabbix-server/Bastillefile deleted file mode 100644 index a270952..0000000 --- a/net-mgmt/zabbix-server/Bastillefile +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE bastillebsd-templates/nginx -INCLUDE bastillebsd-templates/mysql-server -PKG zabbix54-server zabbix54-frontend zabbix54-agent - -SYSRC zabbix_server_enable=YES -SYSRC zabbix_agentd_enable=YES -SYSRC nginx_enable=YES - -## Make the needed SCRIPTS directory -#CMD mkdir /usr/local/etc/zabbix5/scripts - -## Overlay to the system the scripts needed -#OVERLAY zfs-discovery.sh /usr/local/zabbix5/scripts -#OVERLAY zpool-discovery.sh /usr/local/zabbix5/scripts -#OVERLAY nginx.conf /usr/local/etc/nginx/nginx.conf - -# Set the correct owner for the scipts directory -#CMD chown -R zabbix /usr/lcoal/etc/zabbix5/scripts -#CMD chmod +x /usr/local/etc/zabbix5/scripts - -CMD cp /usr/local/etc/zabbix54/zabbix_agentd.conf.sample /usr/local/etc/zabbix54/zabbix_agentd.conf -CMD cp /usr/local/etc/zabbix54/zabbix_server.conf.sample /usr/local/etc/zabbix54/zabbix_server.conf - -SERVICE zabbix_agentd start -SERVICE zabbix_server start diff --git a/net-mgmt/zabbix-server/README.md b/net-mgmt/zabbix-server/README.md deleted file mode 100644 index 9010c02..0000000 --- a/net-mgmt/zabbix-server/README.md +++ /dev/null @@ -1,14 +0,0 @@ -## zabbix-server -Bastille template to bootstrap zabbix-server - -## Bootstrap - -```shell -bastille bootstrap https://github.com/bastillebsd/templates -``` - -## Usage - -```shell -bastille template TARGET bastillebsd-templates/zabbix-server -``` diff --git a/net/asterisk/README.md b/net/asterisk/README.md index b50634a..1437ec5 100644 --- a/net/asterisk/README.md +++ b/net/asterisk/README.md @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET bastillebsd-templates/asterisk +bastille template TARGET net/asterisk ``` diff --git a/security/openssh-server/README.md b/security/openssh-server/README.md index de15d31..441885a 100644 --- a/security/openssh-server/README.md +++ b/security/openssh-server/README.md @@ -8,7 +8,7 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET bastillebsd-templates/openssh-server +bastille template TARGET security/openssh-server ``` ## Optional: diff --git a/security/vault/README.md b/security/vault/README.md index c26b206..ce83b71 100644 --- a/security/vault/README.md +++ b/security/vault/README.md @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET bastillebsd-templates/vault +bastille template TARGET security/vault ``` diff --git a/sysutils/bastille/Bastillefile b/sysutils/bastille/Bastillefile deleted file mode 100644 index d65c718..0000000 --- a/sysutils/bastille/Bastillefile +++ /dev/null @@ -1,3 +0,0 @@ -PKG bastille -SYSRC bastille_enable=YES -SYSRC cloned_interfaces+=lo1 diff --git a/sysutils/bastille/README.md b/sysutils/bastille/README.md deleted file mode 100644 index 3708d48..0000000 --- a/sysutils/bastille/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# bastille -Bastille template to bootstrap bastille - -## Bootstrap -```shell -bastille bootstrap https://github.com/bastillebsd/templates -``` - -## Usage -```shell -bastille template TARGET sysutils/bastille -``` diff --git a/sysutils/consul/README.md b/sysutils/consul/README.md index c2c2c49..e926a5d 100644 --- a/sysutils/consul/README.md +++ b/sysutils/consul/README.md @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET bastillebsd-templates/consul +bastille template TARGET sysutils/consul ``` diff --git a/sysutils/syslog-ng/README.md b/sysutils/syslog-ng/README.md index 872af15..77459d6 100644 --- a/sysutils/syslog-ng/README.md +++ b/sysutils/syslog-ng/README.md @@ -9,5 +9,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET bastillebsd-templates/syslog-ng +bastille template TARGET sysutils/syslog-ng ``` diff --git a/sysutils/tarsnap/README.md b/sysutils/tarsnap/README.md index b4a94f2..9388b5e 100644 --- a/sysutils/tarsnap/README.md +++ b/sysutils/tarsnap/README.md @@ -8,7 +8,7 @@ bastille bootstrap https://github.com/bastillebsd-templates/tarsnap ## Usage ```shell -bastille template TARGET bastillebsd-templates/tarsnap +bastille template TARGET sysutils/tarsnap ``` ## Post Install diff --git a/textproc/elasticsearch/README.md b/textproc/elasticsearch/README.md index b697bca..07eca15 100644 --- a/textproc/elasticsearch/README.md +++ b/textproc/elasticsearch/README.md @@ -1,5 +1,5 @@ # elasticsearch -Bastille template to bootstrap Elasticserch +Bastille template to bootstrap Elasticserch 7 ## Bootstrap ```shell @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET bastillebsd-templates/elasticsearch +bastille template TARGET textproc/elasticsearch7 ``` diff --git a/textproc/kibana/README.md b/textproc/kibana/README.md index 64ade37..32da8b6 100644 --- a/textproc/kibana/README.md +++ b/textproc/kibana/README.md @@ -1,5 +1,5 @@ ## kibana -Bastille template to bootstrap kibana +Bastille template to bootstrap kibana 7 ## Bootstrap ```shell @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET www/kibana +bastille template TARGET textproc/kibana7 ``` diff --git a/www/gitea/README.md b/www/gitea/README.md index a329553..eb1c88d 100644 --- a/www/gitea/README.md +++ b/www/gitea/README.md @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET bastillebsd-templates/gitea --arg SECRET_KEY=`openssl rand -base64 16` --arg JWT_SECRET=`openssl rand -base64 32` --arg INTERNAL_TOKEN=`openssl rand -base64 64` +bastille template TARGET www/gitea --arg SECRET_KEY=`openssl rand -base64 16` --arg JWT_SECRET=`openssl rand -base64 32` --arg INTERNAL_TOKEN=`openssl rand -base64 64` ``` diff --git a/www/grafana/README.md b/www/grafana/README.md index 17d63f4..6a416c4 100644 --- a/www/grafana/README.md +++ b/www/grafana/README.md @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd-templates/grafana ## Usage ```shell -bastille template TARGET bastillebsd-templates/grafana +bastille template TARGET www/grafana ``` diff --git a/www/nextcloud/README.md b/www/nextcloud/README.md index 47b615a..1dc9be5 100644 --- a/www/nextcloud/README.md +++ b/www/nextcloud/README.md @@ -8,5 +8,5 @@ bastille bootstrap https://github.com/bastillebsd/templates ## Usage ```shell -bastille template TARGET bastillebsd-templates/nextcloud +bastille template TARGET www/nextcloud ```