diff --git a/.gitignore b/.gitignore index b338d88..9584fc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .veid cache +keys testing diff --git a/Makefile.global b/Makefile.global index 303d2b2..67a95c3 100644 --- a/Makefile.global +++ b/Makefile.global @@ -1,8 +1,8 @@ # SSH Public Key for root. This can be commented out if not required. # Multiple entries can be provided. Proxmox will prompt for root password # or SSH key at template deployment, this setting allows -SSH_KEY +="abcd12345\n" -SSH_KEY +="zxcvbn345\n" +SSH_KEY +="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9Wh7yS/6uq112z+KvbYnQmam2DQrbxeaa/DsU9fBms7eo3yrAQOSj+l1h+XksWMBKTeYQczo08gCLz+5MijUg2VhrGSl4B/dIYHGRm+/yXiaICb5/76u6+jTr1m5Pk4q2FKPRbb7MOzrUobZr6zNdqg3a56V6oMdedsakEh4P/kupt6CntOM+3gGfk884Pa+1uciUDhaLYRd59EDZUb0uQIx/sKalP9JzM/5/ilQVP0Y3/tzt5DR1zIlV/X2/EYMzN7Ktg3/fd0p07bx7rYrjwpzWmaIfw0F+s2igu1yItCQsAa3S9PAAmY+PwZ+zncZDWpdwVp71/I3082yhjnwl dab_key1@nate.id.au\n" +SSH_KEY +="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCaLbPkfm7OFUAujAu5LXL7H6B+71HXo+tLkB5j8De1rd42RHx4tF7lvZFCdwFuKe3KWSPoNIRBfg9qESe/DsYQcKMG2dj0GQNC5qtuhbjBOHU6pV7vNx2LVjvNDgglTVDx/eCPv8mt3fIzBBjI2uV0/MVkUpVc0XmXsyqsbqR/uapYJgvrRN5dq8xUSlG+sg8aq98YZSuWpw6mNQMyIfI7e0YbOFTWNcHwh7TYC8/qV/3dPHb3m1HH9anKd4hJkVs7rQLo+9Id6vl0k362xIUawBqlUliqbb/Y5KJDIJebQbRrWnR4c1BNplMGL1AU4rQAXdslzZ8QozjHfUs5XmMRBpFUtGirCYJ1kip25i3mqlE3mPBYTZEZ53/UYzMaKCA11tBZ3ULMzfX0cU2pkcqtiywlOBiMrlHaH5ulZevfHZbn0KXPaxB2Q7vDIT9SH5eFwqBaGoI+VrQDZFcbYV2F5t/zv5WfVGiuHEb9WSQ1++ZcBsSGHKncLSsk03M14wCt23gKUZOwn3inwR8qegvcCBuzuphmNjXpE0bQQMaU0R0sQtf3qZjlnwS6yxACNZ5RXKvqDzUFF0VEoA1CLLNjL3EnNSrhPXXRNKhsprfM428Jq3LoR9pJjzRa8nksE+0LDIwfjPZXqI9nRCTjV+Gegh350OnqtMC4XQKyZVmCOw== dab_key2@nate.id.au\n" # Add standard packages that you would like by default on all templates PACKAGES += sudo tcpdump traceroute diff --git a/ansible/Makefile b/ansible/Makefile index 9144b16..29c9999 100644 --- a/ansible/Makefile +++ b/ansible/Makefile @@ -16,6 +16,10 @@ info/init_ok: dab.conf dab init touch $@ +.PHONY: template +template: + cp ubuntu-16.04-ansible_16.04-1_amd64.tar.gz /var/lib/vz/template/cache + .PHONY: clean clean: dab clean diff --git a/jessie_minimal/Makefile b/jessie_minimal/Makefile index e758abb..3627b5f 100644 --- a/jessie_minimal/Makefile +++ b/jessie_minimal/Makefile @@ -16,6 +16,10 @@ info/init_ok: dab.conf dab init touch $@ +.PHONY: template +template: + cp debian-8.0-minimal_8.5-1_amd64.tar.gz /var/lib/vz/template/cache + .PHONY: clean clean: dab clean diff --git a/jessie_standard/.gitignore b/jessie_standard/.gitignore index 8e0a5bb..104970b 100644 --- a/jessie_standard/.gitignore +++ b/jessie_standard/.gitignore @@ -1,8 +1,6 @@ -<<<<<<< HEAD .veid -======= ->>>>>>> cdeb30b537af4d02d82b35fd997e82cc88bd1f24 config info logfile rootfs +debian-8.0-standard_8.5-1_amd64.tar.gz diff --git a/jessie_standard/Makefile b/jessie_standard/Makefile index 811c24f..a74e92b 100644 --- a/jessie_standard/Makefile +++ b/jessie_standard/Makefile @@ -15,6 +15,10 @@ info/init_ok: dab.conf dab init touch $@ +.PHONY: template +template: + cp debian-8.0-standard_8.5-1_amd64.tar.gz /var/lib/vz/template/cache + .PHONY: clean clean: dab clean diff --git a/jessie_standard/README.md b/jessie_standard/README.md index 3a825d7..13967ea 100644 --- a/jessie_standard/README.md +++ b/jessie_standard/README.md @@ -2,5 +2,5 @@ - Built from a standard debootstrap install of Debian Jessie - Adds any customizations such as root login enabled or SSH keys from ../Makefile.global -- Total uncompressed image size is *0MB* -- Total compressed image size is *0MB* +- Total uncompressed image size is *552 MB* +- Total compressed image size is *193 MB* diff --git a/nginx_rproxy/.gitignore b/nginx_rproxy/.gitignore new file mode 100644 index 0000000..bb0cb9e --- /dev/null +++ b/nginx_rproxy/.gitignore @@ -0,0 +1,6 @@ +.veid +config +info +logfile +rootfs +ubuntu-16.04-ansible_16.04-1_amd64.tar.gz diff --git a/zabbix_server/.gitignore b/zabbix_server/.gitignore new file mode 100644 index 0000000..bb0cb9e --- /dev/null +++ b/zabbix_server/.gitignore @@ -0,0 +1,6 @@ +.veid +config +info +logfile +rootfs +ubuntu-16.04-ansible_16.04-1_amd64.tar.gz diff --git a/zabbix_server/Makefile b/zabbix_server/Makefile new file mode 100644 index 0000000..4d15698 --- /dev/null +++ b/zabbix_server/Makefile @@ -0,0 +1,36 @@ + +BASEDIR:=$(shell dab basedir) +PKG=zabbix-server-mysql_3.2.3-1+xenial_amd64.deb +include ../Makefile.global + +.PHONY: bootstrap global finalize +all: info/init_ok bootstrap global finalize + +bootstrap: + dab bootstrap + dab task mysql --password random + wget http://repo.zabbix.com/zabbix/3.2/ubuntu/pool/main/z/zabbix/$(PKG) -o $(PKG) + install -m 0600 $(PKG) ${BASEDIR}/tmp + dpkg -i ${BASEDIR}/tmp/$(PKG) + rm -f /tmp/$(PKG) + +finalize: + dab finalize + +info/init_ok: dab.conf + dab init + touch $@ + +.PHONY: template +template: + cp ubuntu-16.04-ansible_16.04-1_amd64.tar.gz /var/lib/vz/template/cache + +.PHONY: clean +clean: + dab clean + rm -f *~ + +.PHONY: dist-clean +dist-clean: + dab dist-clean + rm -f *~ diff --git a/zabbix_server/dab.conf b/zabbix_server/dab.conf new file mode 100644 index 0000000..b9e1aa6 --- /dev/null +++ b/zabbix_server/dab.conf @@ -0,0 +1,14 @@ +Suite: xenial +CacheDir: ../cache +Source: http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse +Source: http://archive.ubuntu.com/ubuntu xenial-updates main restricted universe multiverse +Source: http://archive.ubuntu.com/ubuntu xenial-security main restricted universe multiverse +Source: http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main +Architecture: amd64 +Name: zabbix_server +Version: 16.04-1 +Section: system +Maintainer: Nathan Gardiner +Infopage: http://www.zabbix.com +Description: Ansible Environment + Ansible is the simplest way to automate apps and IT infrastructure. Application Deployment + Configuration Management + Continuous Delivery