protonphoton/lj-packer
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[fix] cleanup

Browse Source
This commit is contained in:
alban 2020-09-24 15:45:34 +02:00
parent 3422f8b467
commit 67ed0cb9e0
3 changed files with 124 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
build.json
View File

@ -1,47 +1,45 @@
{
"variables": {
"user": "root",
"password": "laser",
"disk_size": "100000",
"domain": ""
"variables":{
"user":"root",
"password":"laser",
"disk_size":"5G",
"domain":""
},
"builders": [
"builders":[
{
"type": "lxc",
"name": "teamlaser-lj-lxc",
"config_file": "files/lxc/config",
"template_name": "debian",
"template_environment_vars": ["SUITE=buster"],
"output_directory": "output-lxc"
},
{
"headless": false,
"name": "teamlaser-lj",
"type": "qemu",
"format": "qcow2",
"accelerator": "kvm",
"disk_size": "{{ user `disk_size` }}",
"output_directory": "output",
"boot_key_interval": "20ms",
"iso_url": "http://cdimage.debian.org/debian-cd/10.5.0/amd64/iso-cd/debian-10.5.0-amd64-netinst.iso",
"iso_checksum": "sha256:93863e17ac24eeaa347dfb91dddac654f214c189e0379d7c28664a306e0301e7",
"http_directory": "http",
"ssh_username": "{{ user `user` }}",
"ssh_password": "{{ user `password` }}",
"shutdown_command": "echo '{{ user `password` }}' | sudo -S shutdown -h now",
"ssh_wait_timeout": "60m",
"qemuargs": [
[ "-m", "2048M" ]
"type":"lxc",
"name":"teamlaser-lj-lxc",
"config_file":"files/lxc/config",
"template_name":"debian",
"template_environment_vars":[
"SUITE=buster"
],
"boot_wait": "2s",
"boot_command": [
"output_directory":"output-lxc"
},
{
"headless":false,
"name":"teamlaser-lj",
"type":"qemu",
"format":"qcow2",
"accelerator":"kvm",
"disk_size":"{{ user `disk_size` }}",
"output_directory":"output",
"boot_key_interval":"20ms",
"iso_url":"http://cdimage.debian.org/debian-cd/10.5.0/amd64/iso-cd/debian-10.5.0-amd64-netinst.iso",
"iso_checksum":"sha256:93863e17ac24eeaa347dfb91dddac654f214c189e0379d7c28664a306e0301e7",
"http_directory":"http",
"ssh_username":"{{ user `user` }}",
"ssh_password":"{{ user `password` }}",
"shutdown_command":"echo '{{ user `password` }}' | sudo -S shutdown -h now",
"ssh_wait_timeout":"60m",
"qemuargs":[
[
"-m",
"2048M"
]
],
"boot_wait":"2s",
"boot_command":[
"<esc><wait><wait>",
"install ",
"auto=true ",
@ -51,32 +49,30 @@
"<enter>"
]
},
{
"headless": false,
"name": "teamlaser-lj-xfce",
"type": "qemu",
"format": "qcow2",
"accelerator": "kvm",
"disk_size": "{{ user `disk_size` }}",
"output_directory": "output-xfce",
"boot_key_interval": "20ms",
"iso_url": "http://cdimage.debian.org/debian-cd/10.5.0/amd64/iso-cd/debian-10.5.0-amd64-xfce-CD-1.iso",
"iso_checksum": "sha256:14ca00bafcaf124ef2cab9da2f51d75044232ba9630a067d8664fabcb5e26ec2",
"http_directory": "http",
"ssh_username": "{{ user `user` }}",
"ssh_password": "{{ user `password` }}",
"shutdown_command": "echo '{{ user `password` }}' | sudo -S shutdown -h now",
"ssh_wait_timeout": "60m",
"qemuargs": [
[ "-m", "2048M" ]
"headless":false,
"name":"teamlaser-lj-xfce",
"type":"qemu",
"format":"qcow2",
"accelerator":"kvm",
"disk_size":"{{ user `disk_size` }}",
"output_directory":"output-xfce",
"boot_key_interval":"20ms",
"iso_url":"http://cdimage.debian.org/debian-cd/10.5.0/amd64/iso-cd/debian-10.5.0-amd64-xfce-CD-1.iso",
"iso_checksum":"sha256:14ca00bafcaf124ef2cab9da2f51d75044232ba9630a067d8664fabcb5e26ec2",
"http_directory":"http",
"ssh_username":"{{ user `user` }}",
"ssh_password":"{{ user `password` }}",
"shutdown_command":"echo '{{ user `password` }}' | sudo -S shutdown -h now",
"ssh_wait_timeout":"60m",
"qemuargs":[
[
"-m",
"2048M"
]
],
"boot_wait": "2s",
"boot_command": [
"boot_wait":"2s",
"boot_command":[
"<esc><wait><wait>",
"install ",
"auto=true ",
@ -87,14 +83,14 @@
]
}
],
"provisioners": [
"provisioners":[
{
"type": "shell",
"inline": [
"type":"shell",
"inline":[
"sleep 3",
"apt update",
"apt install -y --no-install-recommends cmake git libasound2-dev libjack-dev libsdl1.2-dev network-manager nginx portaudio19-dev python3-dev python3-pip python3-rtmidi redis-server screen ssh ssl-cert ",
"rm -f /etc/nginx/sites-enabled/default",
"pip3 install setuptools",
"pip3 install DMXEnttecPro mido numpy pysimpledmx redis scipy ",
"git clone https://github.com/ptone/pyosc --depth 1 /tmp/pyosc && cd /tmp/pyosc && ./setup.py install ",
@ -104,14 +100,14 @@
]
},
{
"type": "file",
"source": "files/nginx/laser.conf",
"destination": "/etc/nginx/sites-enabled/laser.conf"
"type":"file",
"source":"files/nginx/laser.conf",
"destination":"/etc/nginx/sites-enabled/laser.conf"
},
{
"type": "file",
"source": "files/root/.bashrc",
"destination": "/root/.bashrc"
"type":"file",
"source":"files/root/.bashrc",
"destination":"/root/.bashrc"
}
]
}

21
files/nginx/laser.conf
View File

@ -1,12 +1,21 @@
server {
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
listen 80;
listen [::]:80;
server_name _;
root /opt/LJ/www;
index index.html index.htm index.nginx-debian.html;
return 301 https://localhost$request_uri;
}
server {
listen 443 ssl;
listen [::]:443 ssl;
server_name _;
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
root /opt/LJ/www;
index index.html index.htm;
}

1
files/root/.bashrc
View File

@ -11,7 +11,6 @@ echo -e "\e[0m\n"
# Check the ip address on the machine
checkNetwork(){
echo -e "\Checking network connectivity..."
ping=$( ping 1.1.1.1 -c 1 -W 2 &>/dev/null; echo $?;)