Skip to content

Commit

Permalink
remove otp
Browse files Browse the repository at this point in the history
  • Loading branch information
bkbilly committed Oct 10, 2019
1 parent fe8f35c commit 42b88bd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
7 changes: 0 additions & 7 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ else
fi
defusername=`echo $serverJson | jq -r ".users | keys[0]"`
defpassword=`echo $serverJson | jq -r ".users.$defusername.pw"`
deftimezone=`echo $settingsJson | jq -r ".settings.timezone"`

read -p "Change port? [$defport] " port
if [[ ! $port =~ ^[0-9]+$ ]]; then
Expand All @@ -87,18 +86,12 @@ read -p "Password [$defpassword]: " password
if [[ $password == "" ]]; then
password=$defpassword
fi
echo "Find your timezone here: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"
read -p "Enter your timezone [$deftimezone]: " timezone
if [[ $timezone == "" ]]; then
timezone=$deftimezone
fi
serverJson=`echo $serverJson | jq ".ui.port=$port"`
serverJson=`echo $serverJson | jq ".ui.https=$https"`
serverJson=`echo $serverJson | jq ".users.$defusername.pw=\"$password\""`
if [ "$defusername" != "$username" ]; then
serverJson=`echo $serverJson | jq ".users.$username=.users.$defusername | del(.users.$defusername)"`
fi
settingsJson=`echo $settingsJson | jq ".settings.timezone=\"$timezone\""`
echo $settingsJson | jq '.' | sudo tee $basedir/settings.json > /dev/null
echo $serverJson | jq '.' | sudo tee $basedir/server.json > /dev/null

Expand Down
16 changes: 8 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
from setuptools import setup, find_packages

REQUIRES = [
'Flask==1.1.1',
'Flask-SocketIO==4.2.1',
'Flask-Login==0.4.1',
'requests==2.22.0',
'pytz==2019.2',
'paho-mqtt==1.4.0',
'RPi.GPIO==0.7.0',
'Flask>=1.1.1',
'Flask-SocketIO>=4.2.1',
'Flask-Login>=0.4.1',
'requests>=2.22.0',
'pytz>=2019.2',
'paho-mqtt>=1.4.0',
'RPi.GPIO>=0.7.0',
]


setup(
name='AlarmPI',
version='4.0',
version='4.1',
description='Home Security System',
author='bkbilly',
author_email='[email protected]',
Expand Down

0 comments on commit 42b88bd

Please sign in to comment.