diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..8633ad4 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,69 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# All Vagrant configuration is done below. The "2" in Vagrant.configure +# configures the configuration version (we support older styles for +# backwards compatibility). Please don't change it unless you know what +# you're doing. +Vagrant.configure("2") do |config| + # The most common configuration options are documented and commented below. + # For a complete reference, please see the online documentation at + # https://docs.vagrantup.com. + + # Every Vagrant development environment requires a box. You can search for + # boxes at https://vagrantcloud.com/search. + config.vm.box = "debian/buster64" + + # Disable automatic box update checking. If you disable this, then + # boxes will only be checked for updates when the user runs + # `vagrant box outdated`. This is not recommended. + # config.vm.box_check_update = false + + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + # NOTE: This will enable public access to the opened port + # config.vm.network "forwarded_port", guest: 80, host: 8080 + + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine and only allow access + # via 127.0.0.1 to disable public access + config.vm.network "forwarded_port", guest: 5000, host: 5000, host_ip: "127.0.0.1" + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network "private_network", ip: "192.168.33.10" + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + # config.vm.network "public_network" + + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + # config.vm.synced_folder "../data", "/vagrant_data" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + # config.vm.provider "virtualbox" do |vb| + # # Display the VirtualBox GUI when booting the machine + # vb.gui = true + # + # # Customize the amount of memory on the VM: + # vb.memory = "1024" + # end + # + # View the documentation for the provider you are using for more + # information on available options. + + # Enable provisioning with a shell script. Additional provisioners such as + # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the + # documentation for more information about their specific syntax and use. + config.vm.provision "shell", inline: <<-SHELL + sudo /vagrant/install.sh + SHELL +end diff --git a/install.sh b/install.sh index 1d46095..1139002 100755 --- a/install.sh +++ b/install.sh @@ -35,11 +35,11 @@ show_menu () { apt-get -y update; apt-get -y upgrade; fi - apt-get -y install python-setuptools - easy_install pip - apt-get -y install python-dev - apt-get -y install libpcre3-dev - pip install -r requirements.txt +# apt-get -y install python-setuptools +# easy_install pip + apt-get -y install python3-pip python3-dev + apt-get -y install libpcre3-dev git + pip3 install -r requirements.txt confirmAnswer "Would you like to add active 1-wire support at your Raspberry PI now? IMPORTANT: The 1-wire thermometer must be conneted to GPIO 4!" if [ $? = 0 ]; then diff --git a/run.py b/run.py index 84419dc..8616882 100755 --- a/run.py +++ b/run.py @@ -1,10 +1,14 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 +""" +cbpi runner +""" + from modules import socketio, app, cbpi try: - port = int(cbpi.get_config_parameter('port', '5000')) + PORT = int(cbpi.get_config_parameter('port', '5000')) except ValueError: - port = 5000 + PORT = 5000 -socketio.run(app, host='0.0.0.0', port=port) +socketio.run(app, host='0.0.0.0', port=PORT)