Refactoring

etc/polkit-1/localauthority/50-local.d/58-smartpinetworkmanager.pkla

@@ -0,0 +1,6 @@
+[Let adm group modify system settings for network]
+Identity=unix-group:smartpiadmin
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=yes
+ResultActive=yes

etc/polkit-1/localauthority/50-local.d/59-smartpinetworkmanager.pkla

@@ -0,0 +1,6 @@
+[NetworkManager.settings.modify.system allow some user]
+Identity=unix-user:smartpi;
+Action=org.freedesktop.NetworkManager.settings.modify.system
+ResultAny=yes
+ResultInactive=yes
+ResultActive=yes

etc/smartpi

@@ -1,117 +1,61 @@
 [base]
-serial="smartpi2302140012345"
-name="House"
-# Valid log levels: panic, error, info, debug
-loglevel=error
-metrics_listen_address=":9246"
-check_smartpirunning = 1
+name                   = SmartPi 1000000029d5a500
+loglevel               = info
+metrics_listen_address = :9246
 
 [location]
-lat=52.3667
-lng=9.7167
+lat = 52.3192358
+lng = 9.7189549
 
 [database]
-counter_enabled  = true
-counterdir       = /var/smartpi
 database_enabled = true
-sqlite_enabled   = true
-sqlite_dir       = /var/smartpi/db
-dir              = /var/smartpi/db
+influxversion    = 2
 influxuser       = smartpi
 influxpassword   = smart4pi
 influxdatabase   = http://localhost:8086
-influxapitoken   = /////SECRET////
+influxapitoken   = cg_gCGlRKeox4XiD7ti55gZKIhwlfknH7HKJo_hczmhjh_Dkutz291oAF82GHkEG8HfVGAQWKwZIuXJGwtdtLw==
 influxorg        = smartpi
 influxbucket     = meteringdata
-influxversion    = 2
-
-
-[device]
-samplerate=1
-i2c_device="/dev/i2c-1"
-power_frequency=50
-ct_type_1=YHDC_SCT013
-ct_type_2=YHDC_SCT013
-ct_type_3=YHDC_SCT013
-ct_type_4=YHDC_SCT013
-measure_current_1=1
-measure_current_2=1
-measure_current_3=1
-measure_voltage_1=1
-measure_voltage_2=1
-measure_voltage_3=1
-voltage_1=230
-voltage_2=230
-voltage_3=230
-change_current_direction_1=0
-change_current_direction_2=0
-change_current_direction_3=0
-change_current_direction_4=0
-ct_type_1_primary_current  = 100
-ct_type_2_primary_current  = 100
-ct_type_3_primary_current  = 100
-ct_type_4_primary_current  = 100
 
 [ftp]
-ftp_upload=0
-ftp_server=ftp.xxxxx.xx
-ftp_user=xxxxxxxxxxx
-ftp_pass=xxxxxxxxxxxx
-ftp_path=smartpi/
-ftp_csv=1
-ftp_xml=1
-
-[csv]
-decimalpoint=,
-timeformat=2006-01-02 15:04:05
+ftp_upload    = false
+ftp_server    = 
+ftp_user      = 
+ftp_pass      = 
+ftp_path      = 
+ftp_csv       = true
+ftp_xml       = true
+ftp_sendtimes = false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false
 
 [webserver]
-shared_file_enabled=true
-shared_dir="/var/run"
-shared_file="smartpi_values"
-port=1080
-docroot="/var/smartpi/www"
-app_key = "ew980723j35h97fqw4!234490#t33465"
-dashboard = "smartpi"
+shared_file_enabled = true
+shared_dir          = /var/run/smartpi
+port                = 1080
+docroot             = /var/smartpi/www
+appkey              = `ew980723j35h97fqw4!234490#t33465`
+secure_values       = false
+
+[csv]
+decimalpoint = 
+timeformat   = 
 
 [mqtt]
-mqtt_enabled=0
-mqtt_broker_scheme="tcp://"
-mqtt_broker_url=""
-mqtt_broker_port=""
-mqtt_username=""
-mqtt_password=""
-mqtt_topic=""
+mqtt_enabled       = false
+mqtt_broker_scheme = tcp://
+mqtt_broker_url    = 
+mqtt_broker_port   = 
+mqtt_username      = 
+mqtt_password      = 
+mqtt_topic         = 
+mqtt_qos           = 0
 
 [modbus]
-modbus_rtu_enabled=0
-modbus_tcp_enabled=0
-modbus_rtu_address=1
-modbus_rtu_device_id="/dev/serial0"
-modbus_tcp_address=":502"
-
-
-[calibration]
-calibrationfactorI_1=1.0
-calibrationfactorI_2=1.0
-calibrationfactorI_3=1.0
-calibrationfactorI_4=1.0
-calibrationfactorU_1=1.0
-calibrationfactorU_2=1.0
-calibrationfactorU_3=1.0
-
-[gui]
-gui_max_current_1 = 100
-gui_max_current_2 = 100
-gui_max_current_3 = 100
-gui_max_current_4 = 100
-
-[appkey]
-appkey = `ew980723j35h97fqw4!234490#t33465`
-
-[emeter]
-emeter_enabled           = true
-emeter_multicast_address = 239.12.255.254
-emeter_multicast_port    = 9522
-emeter_susy_id           = 270
-emeter_serial            = 340585213
+modbus_rtu_enabled   = false
+modbus_tcp_enabled   = false
+modbus_rtu_address   = 1
+modbus_rtu_device_id = /dev/serial0
+modbus_tcp_address   = :502
+
+[files]
+counter_enabled = true
+counterdir      = /var/smartpi

etc/smartpiAC

@@ -0,0 +1,48 @@
+[device]
+i2c_device                 = /dev/i2c-1
+power_frequency            = 50
+samplerate                 = 1
+integrator                 = false
+storesamples               = false
+ct_type_1                  = YHDC_SCT013
+ct_type_2                  = YHDC_SCT013
+ct_type_3                  = YHDC_SCT013
+ct_type_4                  = YHDC_SCT013
+ct_type_1_primary_current  = 100
+ct_type_2_primary_current  = 100
+ct_type_3_primary_current  = 100
+ct_type_4_primary_current  = 100
+change_current_direction_1 = false
+change_current_direction_2 = false
+change_current_direction_3 = false
+change_current_direction_4 = false
+measure_current_1          = true
+measure_current_2          = true
+measure_current_3          = true
+measure_current_4          = true
+measure_voltage_1          = true
+measure_voltage_2          = true
+measure_voltage_3          = true
+voltage_1                  = 230
+voltage_2                  = 230
+voltage_3                  = 230
+calibrationfactorI_1       = 1
+calibrationfactorI_2       = 1
+calibrationfactorI_3       = 1
+calibrationfactorI_4       = 1
+calibrationfactorU_1       = 1
+calibrationfactorU_2       = 1
+calibrationfactorU_3       = 1
+
+[gui]
+gui_max_current_1 = 100
+gui_max_current_2 = 100
+gui_max_current_3 = 100
+gui_max_current_4 = 100
+
+[emeter]
+emeter_enabled           = true
+emeter_multicast_address = 239.12.255.254
+emeter_multicast_port    = 9522
+emeter_susy_id           = 270
+emeter_serial            = 1247304338

etc/smartpiModules

@@ -0,0 +1,27 @@
+[base]
+i2c_device = /dev/i2c-1
+webserver  = true
+vfs        = true
+loglevel   = info
+
+[digitalout]
+allowed_user = 
+
+[etemperature]
+allowed_user        = 
+i2c_address         = 0x52
+samplerate          = 6
+shared_file_enabled = true
+shared_dir          = /var/run/smartpi
+shared_file         = smartpi_etemperature_values
+
+[lorawan]
+lorawan_enabled       = false
+shared_files_path     = /var/run/smartpi/trafobox_values
+shared_files_elements = 1:2f:1.0|2:2f:1.0|3:2f:1.0|4:2f:1.0|5:2f:1.0|6:2f:1.0|7:2f:1.0|8:2f:1.0|9:2f:1.0|10:2f:1.0|11:2f:1.0|12:2f:1.0|13:2f:1.0|14:2f:1.0|15:2f:1.0|16:2f:1.0|17:2f:1.0|18:2f:1.0|19:2f:1.0|20:2f:1.0|21:2f:1.0|22:2f:1.0|23:2f:1.0|24:2f:1.0|25:2f:1.0|26:2f:1.0|27:2f:1.0|28:2f:1.0|29:2f:1.0|30:2f:1.0|31:2f:1.0|32:2f:1.0|33:2f:1.0|34:2f:1.0|35:2f:1.0|36:2f:1.0|37:2f:1.0|38:2f:1.0|39:2f:1.0|40:2f:1.0|41:2f:1.0|42:2f:1.0|43:2f:1.0|44:2f:1.0|45:2f:1.0|46:2f:1.0|47:2f:1.0|48:2f:1.0|49:2f:1.0|50:2f:1.0|51:2f:1.0|52:2f:1.0|53:2f:1.0|54:2f:1.0
+interval              = 300
+serial_port           = /dev/ttyS0
+applicationEUI        = 
+applicationKey        = 
+datarate              = 5
+shared_file_enabled   = true

etc/systemd/system/smartpiemeter.service

@@ -16,7 +16,7 @@ Restart=on-failure
 RestartSec=2s
 StandardOutput=null
 StandardError=journal
-RemainAfterExit=no
+RemainAfterExit=yes
 User=root
 StartLimitBurst=0