simo 2.1.4__py3-none-any.whl → 2.1.5__py3-none-any.whl

simo/core/api_auth.py

@@ -41,7 +41,3 @@ class IsAuthenticated(SessionAuthentication):
 
     def authenticate_header(self, request):
         return "None"
-
-
-
-

simo/fleet/forms.py

@@ -146,7 +146,7 @@ class ColonelComponentForm(BaseComponentForm):
                 continue
             if pin_instances[i].colonel != self.cleaned_data['colonel']:
                 formset_errors[i] = {
-                    'pin': f"{pin_instances[i]} must be from the same Colonel!"
+                    'input': f"{pin_instances[i]} must be from the same Colonel!"
                 }
             elif pin_instances[i].occupied_by \
             and pin_instances[i].occupied_by != self.instance:

simo/management/install.py

@@ -51,7 +51,7 @@ def copy_template(to_directory='/etc/SIMO'):
         'base_dir': to_directory
     }, autoescape=False)
     template_dir = os.path.join(
-        os.path.dirname(simo.__file__), '_hub_template'
+        os.path.dirname(simo.__file__), 'management', '_hub_template'
     )
     prefix_length = len(template_dir) + 1
     for root, dirs, files in os.walk(template_dir):
@@ -82,8 +82,16 @@ def copy_template(to_directory='/etc/SIMO'):
             else:
                 os.makedirs(os.path.join(root, dirname), exist_ok=True)
 
+    manage_py_path = os.path.join(to_directory, 'hub', 'manage.py')
+    st = os.stat(manage_py_path)
+    os.chmod(manage_py_path, st.st_mode | 0o111)
+
 
 def install():
+    # this must be performed on a host machine before simo could be installed.
+    #
+    # apt install python3-pip libpq-dev python3-dev -y
+
     simo_directory = '/etc/SIMO'
     installed_flag_file_path = os.path.join(simo_directory, 'is_installed.json')
     HUB_DIR = os.path.join(simo_directory, 'hub')
@@ -166,6 +174,7 @@ def install():
         f'{simo_directory}/hub/supervisor.conf',
         '/etc/supervisor/conf.d/SIMO.conf'
     )
+    os.makedirs('/var/log/simo')
     status = subprocess.call(['supervisorctl', 'update', 'all'])
     if status != 0:
         sys.exit("INSTALLATION FAILED! Unable to start supervisord")
@@ -213,10 +222,10 @@ def install():
     with open('/etc/ssh/sshd_config', 'r') as ssh_conf:
         line = ssh_conf.readline()
         while line:
-            if 'PasswordAuthentication' in line:
-                new_ssh_conf += 'PasswordAuthentication no'
-            else:
-                new_ssh_conf += line
+            if line.startswitn('PasswordAuthentication'):
+                line.replace(' yes', ' no')
+            new_ssh_conf += line
+
             line = ssh_conf.readline()
     with open('/etc/ssh/sshd_config', 'w') as ssh_conf:
         ssh_conf.write(new_ssh_conf)
@@ -263,17 +272,22 @@ def install():
         timeshift_conf['schedule_monthly'] = "true"
         timeshift_conf['schedule_weekly'] = "true"
         timeshift_conf['schedule_daily'] = "true"
+        timeshift_conf['exclude'] = []
 
-        # Must be copied to /etc/timeshift.json to work
-        with open('/etc/timeshift.json', 'w') as conf_f:
+        # Must be copied to /etc/timeshift/timeshift.json to work
+        with open('/etc/timeshift/timeshift.json', 'w') as conf_f:
             conf_f.write(json.dumps(timeshift_conf))
 
-        status = subprocess.call([
-            '/usr/bin/timeshift', '--create',
-            '--comments', '"Initial backup"', '--tags', 'M'
-        ])
-        if status != 0:
-            print("Unable to start TimeShift")
+        # status = subprocess.call([
+        #     '/usr/bin/timeshift', '--create',
+        #     '--comments', '"Initial backup"', '--tags', 'M'
+        # ])
+        # if status != 0:
+        #     print("Unable to start TimeShift")
+
+
+    step += 1
+    print("%d.__________ PUT UP INSTALL COMPLETE FLAG! _____________________" % step)
 
     with open(installed_flag_file_path, 'w') as f:
         f.write(json.dumps(True))
@@ -284,4 +298,4 @@ def install():
 
 
 if __name__ == "__main__":
-    sys.exit(init())
+    sys.exit(install())

{simo-2.1.4.dist-info → simo-2.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.1.4
+Version: 2.1.5
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.1.4.dist-info → simo-2.1.5.dist-info}/RECORD

@@ -15,7 +15,7 @@ simo/__pycache__/wsgi.cpython-38.pyc,sha256=TpRxO7VM_ql31hbKphVdanydC5RI1nHB4l0Q
 simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=Gb1lSyvFtYj2oC5lA7j3VqU6zlqlncx5R-_XJbb8Wdk,17927
 simo/core/api.py,sha256=HSokv9CZCCr0WHSzo5TBXe2BF5-EnTZHPnShlzN86ms,25706
-simo/core/api_auth.py,sha256=_3hG4e1eLKrcRnSAOB_xTL6cwtOJ2_7JS7GZU_iqTgA,1251
+simo/core/api_auth.py,sha256=vCxvczA8aWNcW0VyKs5WlC_ytlqeGP_H_hkKUNVkCwM,1247
 simo/core/api_meta.py,sha256=0leq4qdAELwACL7-9V_LCkuzu1VSEexys1b3iz0bsYM,3848
 simo/core/app_widgets.py,sha256=4Lh9FDzdkfh_mccJMe09dyRTT3Uqf9VXwbkurJ9E9oQ,2115
 simo/core/apps.py,sha256=CL4-BX6lYYGwq6hcXL-ozT7RTvy9hyfuiPCC_RfGIY0,267
@@ -48,7 +48,7 @@ simo/core/widgets.py,sha256=J9e06C6I22F6xKic3VMgG7WeX07glAcl-4bF2Mg180A,2827
 simo/core/__pycache__/__init__.cpython-38.pyc,sha256=ZJFM_XN0RmJMULQulgA_wFiOnEtsMoedcOWnXjH-Y8o,208
 simo/core/__pycache__/admin.cpython-38.pyc,sha256=Lqs-wHz-vxGEo7ApOk6nkpNwfxselcFHqAUozotdZU4,13231
 simo/core/__pycache__/api.cpython-38.pyc,sha256=hoCs0HvJFULzhDG4mwhTMMJt3hSDnMXJU_05FPK6dB4,20516
-simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=5UTBr3rDMERAfc0OuOVDwGeQkt6Q7GLBtZJAMBse1sg,1712
+simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=6M9Cl_ha4y_Vf8Rv4GMYL8dcBCmp0KzYi6jn3SQTgys,1712
 simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=Y59fGaKkyo_DJhhcDeRUUguy2OUb6f7_F6RbQRRp0vY,3023
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=vUCEAYqppjgRZYMs6pTuSxWWuZxreLygPuPBGw044dQ,3643
 simo/core/__pycache__/apps.cpython-38.pyc,sha256=S12d7zdc2m_93FeQ4gE6I3l_lh3GAe2Icf1Ra869Kzs,633
@@ -10186,7 +10186,7 @@ simo/fleet/auto_urls.py,sha256=UX66eR2ykMqFgfIllW-RTdjup5-FieCWl_BVm3CcXKg,702
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=ounEUw51X6EYA8xDcGNIik1bDbw4JR3DOGr1FKo4hHs,28829
-simo/fleet/forms.py,sha256=fdq30tA4mx-34eLQnHV1O0XFe3offN-BKcXmltww01k,54423
+simo/fleet/forms.py,sha256=CbrLN_gMCTo8u6fg0ovztkhdYEjHZmSr_3gzsDRMP84,54425
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=U4q813VZmYUpgu7Iw4-z80LfHlkZziIqBKqkQzBA9WI,16304
@@ -10203,7 +10203,7 @@ simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=Tc6a6BCXHjijP8U2jE2ghlJwn
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
 simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=61dvQDl2nIuB4iaCzdBMwQnly_m0OvI7zteRS6sIm5U,23831
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=iC11rfQVEUhjqxIewYX5CoR4cqBXyNzbcmgzRk-TiKc,37436
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=7B6NZnY6yS8qrmv5zlTa07iUYmdv4nW7PTpOVfRn3OY,37436
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=0RKVn0ndreVKhsrukqeLPSdMnRrsQ_W7yeVeBkRLfIk,5058
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=yudhmE7zhXN5t3b63N6TwAtBLC4OXiAZiNBzki3SuHI,13664
@@ -10337,7 +10337,7 @@ simo/generic/templates/generic/controllers_info/stateselect.md,sha256=T0w3vJg02W
 simo/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/management/auto_update.py,sha256=4MDrJHdtC5LxEJM258Y0kc5yI4yloeKhDjh-S2BN-ZQ,2115
 simo/management/copy_template.py,sha256=Iehq57FYMzdHNp3LU4ue6rr6AkRiGeOthG7PoGWd88Q,2002
-simo/management/install.py,sha256=IwSeullwXxATsL4cpLNmOgmVJASwLehopohp9Ua-064,9640
+simo/management/install.py,sha256=s9GqIRwLpli8g_utu2pZ0QGVSXSHFXbkY12S_R3MnVc,10127
 simo/management/on_http_start.py,sha256=ZDotfMQaCjksD5FFf3eZYgJS-gd_-7eZhYTHLaD-448,3312
 simo/management/__pycache__/__init__.cpython-38.pyc,sha256=ey9k5mPsmvAHRVf5Du6QUqy40LgBCAPN_B5EaR6h9Eg,164
 simo/management/__pycache__/on_http_start.cpython-38.pyc,sha256=ERfcMNz3QnqDJTJ4PwbmDfLgPCh5hrEcaedejARFkUQ,2864
@@ -10494,9 +10494,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.1.4.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.1.4.dist-info/METADATA,sha256=BV3GcDw-Fy6Wx4aVwZIwJ6vS_Qwea0cVZbGor3xjYiE,1817
-simo-2.1.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.1.4.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.1.4.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.1.4.dist-info/RECORD,,
+simo-2.1.5.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.1.5.dist-info/METADATA,sha256=sV13UwrNRCCV4LImcqM__PHth4pKToD1KXgItU6eMoY,1817
+simo-2.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.1.5.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.1.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.1.5.dist-info/RECORD,,