diff --git a/apache_conf/apache2.conf b/apache_conf/apache2.conf index 8e33502..9c7ea83 100644 --- a/apache_conf/apache2.conf +++ b/apache_conf/apache2.conf @@ -167,14 +167,14 @@ Include ports.conf Require all granted - + Options Indexes FollowSymLinks AllowOverride None Require all granted -ScriptAlias /cgi-bin/ /home/pi/tcs/ - +ScriptAlias /cgi-bin/ /opt/turtlerover/tcs// + AllowOverride None Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch Order allow,deny diff --git a/apache_conf/sites-available/000-default.conf b/apache_conf/sites-available/000-default.conf index 37f94f6..c604a49 100644 --- a/apache_conf/sites-available/000-default.conf +++ b/apache_conf/sites-available/000-default.conf @@ -9,7 +9,7 @@ #ServerName www.example.com ServerAdmin webmaster@localhost - DocumentRoot /home/pi/tcs/ + DocumentRoot /opt/turtlerover/tcs/ # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. diff --git a/apache_conf/sites-enabled/000-default.conf b/apache_conf/sites-enabled/000-default.conf index 8d02812..c604a49 100644 --- a/apache_conf/sites-enabled/000-default.conf +++ b/apache_conf/sites-enabled/000-default.conf @@ -9,7 +9,7 @@ #ServerName www.example.com ServerAdmin webmaster@localhost - DocumentRoot /home/pi/tcs + DocumentRoot /opt/turtlerover/tcs/ # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. diff --git a/utils/make_deb.sh b/utils/make_deb.sh index c9e1403..412032d 100755 --- a/utils/make_deb.sh +++ b/utils/make_deb.sh @@ -1,5 +1,7 @@ #!/bin/sh +rm *.deb + fpm --input-type dir \ --output-type deb \ --maintainer "Kell ideas Ltd. " \ @@ -8,7 +10,7 @@ fpm --input-type dir \ --license "MIT" \ --url "https://github.com/TurtleRover/tcs" \ --version "0.12.2" \ - --iteration 4 \ + --iteration 6 \ --architecture all \ --deb-no-default-config-files \ --exclude node_modules \ @@ -18,6 +20,7 @@ fpm --input-type dir \ --verbose \ --depends "python3 (>= 3.5.3-1)" \ --depends "apache2" \ + --depends "wiringpi" \ --prefix /opt/turtlerover/tcs \ --description "Turtle Rover Control Software" \ --after-install utils/after-install.sh \