consolidation and cleanup

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2018-2021, Christer Edwards <christer.edwards@gmail.com>
+Copyright (c) 2018-2023, Christer Edwards <christer.edwards@gmail.com>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

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...
+
+```

databases/mariadb-server/Bastillefile

@@ -1,3 +1,3 @@
-PKG mariadb105-server
+PKG mariadb1011-server
 SYSRC mysql_enable=YES
 SERVICE mysql-server restart

databases/mysql-server/Bastillefile

@@ -1,3 +1,3 @@
-PKG mysql57-server
+PKG mysql80-server
 SYSRC mysql_enable=YES
 SERVICE mysql-server restart

databases/percona/Bastillefile

@@ -1,3 +0,0 @@
-PKG percona57-server percona57-client
-SYSRC mysql_enable=YES
-SERVICE mysql-server start

java/openjdk/Bastillefile

@@ -1 +1 @@
-PKG openjdk13
+PKG openjdk20

lang/go-devel/Bastillefile

@@ -0,0 +1 @@
+PKG go-devel

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
 ```

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
 ```

lang/go119/Bastillefile

@@ -0,0 +1 @@
+PKG go119

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
 ```

lang/go120/Bastillefile

@@ -0,0 +1 @@
+PKG go120

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
 ```

lang/go121/Bastillefile

@@ -0,0 +1 @@
+PKG go121

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
 ```

lang/perl/Bastillefile

@@ -1 +0,0 @@
-PKG perl5-devel

lang/php/Bastillefile

@@ -1,3 +0,0 @@
-PKG php74
-SYSRC php_fpm_enable=YES
-SERVICE php-fpm start

lang/python/Bastillefile

@@ -1,2 +1,2 @@
-PKG python3 python
+PKG python
 CMD python -VV

lang/ruby/Bastillefile

@@ -1 +0,0 @@
-PKG ruby

net-mgmt/zabbix-agent/Bastillefile

@@ -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

net-mgmt/zabbix-agent/README.md

@@ -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.

net-mgmt/zabbix-server/Bastillefile

@@ -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

net-mgmt/zabbix-server/README.md

@@ -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
-```

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
 ```

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:

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
 ```

sysutils/bastille/Bastillefile

@@ -1,3 +0,0 @@
-PKG bastille
-SYSRC bastille_enable=YES
-SYSRC cloned_interfaces+=lo1

sysutils/bastille/README.md

@@ -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
-```

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
 ```

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
 ```

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

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
 ```

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
 ```

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`
 ```

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
 ```

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
 ```