encrypt script

deployment/encrypt-secrets.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+gpg --pinentry-mode=loopback --symmetric --cipher-algo AES256 --armor --output secrets.asc secrets.txt
+

deployment/secrets.asc

@@ -1,15 +1,15 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMC4tvOFCp2PT7/0sE+AcZmiGwroHYdWW/vJA1sCoMrM2oW8xUc1KndDGto
+jA0ECQMIEgCXA7BZUZr+0sE3AR8vkK0sgmaFl+emB0SuMvYpVYmCjW1KPpGHBJ85
-dFev2KcoZ4FRL9liCrJ7on773bZFCTDu2xiBNMeKF1p8drub1Ej5l61Oq15mLTYf
+Yq8FOwa2eqTOEjunx8bnJqcQmARGc75+sZRZtlaedwyl0//OlUKELHd2hYlmJrJI
-XjXknFiWWq4PTzhhy53zvDyIV5yIcGfjotpGC83/qH5CBWIcCw9PZHI5+uHRVRKL
+HVa6GDPx+Kra/Z/dk6jjBEjFB0Qkii01TvVfcaNBf+AhQ5FqRO1C8OYVI55F31Ox
-OpdTpekJ8ljPAGQ4F3vbOeBbG1PMoclx8r5SpKxLwQco2iaXd71dXHtPkEnLujd4
+rFDAtG3Jh82OX322ldXEiYuuDyaiFh8JR9AGah1G8oASYh+3qdZCS839lt2ZTeve
-ZRCthVNVfxrIIRcTJfgxewz2oJWYF9008nmtxpKzqfBtNpFIdBtnTTVvv2lfcVuS
+QpIGpD+ZSyjAsXa6m7AJskrB3dwpHMPGBnZrbPFwcKVKxvqS+98K/QmTzqQfvZiu
-S4eav9ljPPd/exZaT7fOGD/kuCdiiu6e0yGLzo2ykf0uBy7hG7ZJg8TH5e+LMBm9
+0ZHYE57QiLcSKKonih2224KvnJkfzibYiHaxY8pWoYGDCSg5wM7PmeXBUg6Z7paP
-Q1OFD+5LWeEsOEdSTlT5UbV5EaVEiawKWQn7rMZOyvBNiPwLaOlquHirWoll5eIm
+xz78RiWSKyivZ7TGmlDb+UIE4qLL4tJiqbUJ/Q7HuQceLjMJaxTsbQWLMPxI+Ooh
-OHgBVN0FiY/righpIoei/KP705FIg+hrpMUvc29PahiL8dgsxJycnKIo4t+2/nac
+0rouXg6YjPacItBmdJJsW+tnvV4wMNrM5bLlQN7myoLg8WSZHOsGbDIcc6DL1GxN
-H144hP/rqBeaobG05TkZIr+Cpt4rpwwfNWOHgmNFHVpxdmPfoeAmpT4nz760hTEN
+6pEFpZsCO5fphJoZcTdwop/wKXhptQBm/M2FqRzQziDsofse8vRCUFCn2fY9oRWI
-2ol4Qh8xL7n4GFiCpNg8tNZiZkPPa/aRUAFxgdq5beossvKukxCexQmlCFvxITSG
+H4Kbf+xa78nfoYpRx+uH4pbWTRIZ/XJu7Oq438kNlFd2QdA8hJk2yvE0FNnsa7Xa
-x9RwssFMnT+wqTuzBN8neBeEF1d9AtAFQKPtg3wkMUyJAlYkxiGS/2NJuYDVpmEQ
+LnTwX+wmFPb/LyKLe94tffm5CEIcLgOrWIgTufp8/eBfjbj3fSui5PY=
-=Wr4f
+=nOkj
 -----END PGP MESSAGE-----

src/pv_routes.py

@@ -19,7 +19,7 @@ def pvstats():
         dbh = psycopg.connect()
         engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
 
-        df = pd.read_sql("SELECT month, cast(year AS varchar), current_energy AS value FROM pv_energy_by_month", con=engine)
+        df = pd.read_sql("SELECT month, cast(year AS varchar), current_energy AS value FROM pv_energy_by_month ORDER BY year, month", con=engine)
         fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
         fig_1.update_layout(
             title=f"Jahreswerte Exportierte Energie PV-Anlage",
@@ -35,7 +35,7 @@ def pvstats():
         )
         graph_html_1 = fig_1.to_html(full_html=False, default_height='30%')
 
-        df = pd.read_sql("SELECT month, cast(year AS varchar), current_energy AS value FROM car_energy_by_month", con=engine)
+        df = pd.read_sql("SELECT month, cast(year AS varchar), current_energy AS value FROM car_energy_by_month ORDER BY year, month", con=engine)
         fig_2 = px.bar(df, x='month', y='value', color='year', barmode='group')
         fig_2.update_layout(
             title=f"Jahreswerte Verbrauch Elektroauto",