clean up

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

group_vars/all/defaults

@@ -19,6 +19,5 @@ ntp:
     #- "2.ch.pool.ntp.org"
     #- "3.ch.pool.ntp.org"
     
-
-letsencrypt_email: "{{vault_letsencrypt_email}}"
+letsencrypt_email: christian.schnidrig@gmail.com
 

group_vars/all/vault

@@ -1,26 +1,17 @@
 $ANSIBLE_VAULT;1.1;AES256
-37393638323966636535643931336337396163363331306232366265323234396130316635313961
-3766343433326532383539623061663537663534306132360a633130383934326336653737623331
-39343766323032353932376265343836613661323566353863333763346130666333323264373562
-3538643931653731380a633138663633363730613936353365326633393662323964373961653036
-38346233393839323135323239653764363862383534653261323332613966643763353938343136
-36323964653637373738633264663035656438346432356461613839393936343565636635323337
-30373336616338343131663164383437316465313566393138633834303130383031636633636232
-64383666343939633766643365386636323634626337633662373232343633643166643035363564
-34386662636130656538646633393164366135636333633430353431643763356534356531633438
-66323065386235383264396231636538303930643834323666613939663134663462383662343762
-31376438623763666335386331363433626431653434333264343833336335336238393063393866
-38346665613737356638623436653737663662633834373035326332343934313537353839306561
-61376363306536393061306465343362653334353336616563666234343532383761373838386332
-32626264363061613837333163643465323432663730633365323936306233653162363566616661
-61343934653533633135616464356664373261643137643836616261313831326139623865656264
-33616134323165366464363235373361653633343831663066383561313331363630383039373030
-64346632386462613234323335303836373936356261393662353261393635666234633135343238
-36396266336265626536643863336563623437313532396233666664373430353665653765643838
-33313430313535303330306632633164376435653431336361336139643737313636323135326538
-62366536613736663465396663663339633966316336353934333231373963313736306363356230
-34643231323335333761366565323365313338343739313866313434613763323735613063323032
-38653734393265656566626430653534383833376635356436633737633337353336663562383765
-61323761356639393532326235373466356136353462373937353365386639326361386564653161
-34393330626332343662373434366138326562353430363336393339353331383164313566383235
-3333
+30303535613532623633306661646164653037323038343838386437643463633937656664653634
+6439643934616538373936396465323466323833303633640a326630646662376237376532313761
+65643938613863333235353536323939353761373936303965316262366465633163626234653132
+6161363266613162360a656433306536663230316631333430373362643034393930353439626134
+39356135633861646539626661623062326531656539623030623637363634396639323935306230
+63383637393438326434626137666637373466363735306334303366646134623332353830633137
+66363531633636313739613264616164646366396634313934333566613936303865623162336463
+63346330366438393965663134326135633436346532383162316234623065623661613138353838
+34666530303838633161643532396535343432633064323938393933353562623366333862333731
+39313562623762313437333738396534646466333461393536316239636134313866393234363931
+63373934363961376634623966616135333835353066656236666139363965643934376162313439
+34653438633630353663363130653434636331376536643765653232323266313462373965343266
+34666639656264313933646264623931626230613636313030346637383361393934653964333565
+34343432613336373834646136306537303463643463653463353066663062323735653631643132
+32303639616533353735336437636634383430623534623935333364323631393536363661303163
+33633939613138336637

group_vars/controller

@@ -12,13 +12,14 @@
 #    - mqtt
 #    - mysql
 
-graphite_server: "{{vault_graphite_server}}"
+#graphite_server: 'grafana.dynv6.net'
+graphite_server: "192.168.1.96"
 
-nginx_user: "{{vault_nginx_user}}"
-nginx_password: "{{vault_nginx_password}}"
+nginx_user: "{{ vault_nginx_user }}"
+nginx_password: "{{ vault_nginx_password }}"
 
-dynv6_name: "{{vault_dynv6_name}}"
-dynv6_device: "{{vault_dynv6_device}}"
-dynv6_token: "{{vault_dynv6_token}}"
+dynv6_name: "schnidrig.dynv6.net"
+dynv6_device: "{{ vault_dynv6_device }}"
+dynv6_token: "{{ vault_dynv6_token }}"
 
-fqdn: "{{vault_fqdn}}"
+fqdn: "schnidrig.dynv6.net"

inventory

@@ -2,6 +2,5 @@
 192.168.1.7 ansible_ssh_user=pi
 
 [raspis]
-192.168.1.5 ansible_ssh_user=pi
+#192.168.1.5 ansible_ssh_user=pi
 192.168.1.7 ansible_ssh_user=pi
-

roles/openhab2/tasks/letsencrypt.yml

@@ -5,23 +5,23 @@
     url: https://dl.eff.org/certbot-auto
     dest: /root/certbot-auto
     mode: 0540
-  tags: 
+  tags:
     - letsencrypt
 
 - name: get certificate
   #shell: '/root/certbot-auto -n run --test-cert --nginx --agree-tos --email {{letsencrypt_email}} --cert-path /etc/nginx/ssl/cert.pem --key-path /etc/nginx/ssl/cert.key --fullchain-path /etc/nginx/ssl/chain.pem -d {{fqdn}}'
   shell: '/root/certbot-auto -n run --nginx --agree-tos --email {{letsencrypt_email}} -d {{fqdn}}'
-  tags: 
+  tags:
     - letsencrypt
 
 
 - name: cron job
-  cron: 
+  cron:
     name: "get new certificate"
     minute: "0"
     hour: "5"
     day: "11"
     job: '/root/certbot-auto -n certonly --nginx --agree-tos --email {{letsencrypt_email}} -d {{fqdn}}'
-  tags: 
+  tags:
     - letsencrypt
-
+    - letsencrypt_cron

roles/openhab2/tasks/packages.yml

@@ -13,6 +13,8 @@
      - sysstat
      - nginx
      - python-passlib
+     - jython
+     - jython-doc
   tags:
      - packages
      - openhab2

roles/openhab2/tasks/repo.yml

@@ -12,7 +12,8 @@
 
 - name: install openhab2 repo
   apt_repository:
-    repo: 'deb http://dl.bintray.com/openhab/apt-repo2 testing main'
+    repo: 'deb https://dl.bintray.com/openhab/apt-repo2 stable main'
+    #repo: 'deb http://openhab.jfrog.io/openhab/openhab-linuxpkg unstable main'
     state: present
     update_cache: yes
     filename: openhab2