From 04e7dcc15e21c9b1a4cc0da4f8a8d8a937ac66ca Mon Sep 17 00:00:00 2001 From: betateilchen <> Date: Sat, 25 Feb 2017 12:40:03 +0000 Subject: [PATCH] debianfhemde: initial commit git-svn-id: https://svn.fhem.de/fhem/trunk@13509 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/debianfhemde/README | 97 ++++++++++++++++++ .../debianfhemde/grafik/favicon.ico | Bin 0 -> 2238 bytes .../debianfhemde/grafik/fhemicon.png | Bin 0 -> 5733 bytes .../debianfhemde/html/default.html | 21 ++++ .../debianfhemde/html/gpg_trouble.html | 43 ++++++++ .../debianfhemde/html/https_trouble.html | 28 +++++ .../debianfhemde/html/stable.html | 30 ++++++ .../debianfhemde/nightly/.gitkeep | 0 .../debianfhemde/debianfhemde/robots.txt | 3 + .../debianfhemde/debianfhemde/stable/.gitkeep | 0 .../debianfhemde/debianfhemde/style/style.css | 80 +++++++++++++++ .../debianfhemde/scripts/mkfhemnightly | 63 ++++++++++++ .../contrib/debianfhemde/scripts/mkfhemstable | 6 ++ .../scripts/templates/index.template | 53 ++++++++++ .../scripts/templates/manual.template | 32 ++++++ .../scripts/templates/nightly.template | 33 ++++++ 16 files changed, 489 insertions(+) create mode 100644 fhem/contrib/debianfhemde/README create mode 100644 fhem/contrib/debianfhemde/debianfhemde/grafik/favicon.ico create mode 100755 fhem/contrib/debianfhemde/debianfhemde/grafik/fhemicon.png create mode 100755 fhem/contrib/debianfhemde/debianfhemde/html/default.html create mode 100755 fhem/contrib/debianfhemde/debianfhemde/html/gpg_trouble.html create mode 100755 fhem/contrib/debianfhemde/debianfhemde/html/https_trouble.html create mode 100755 fhem/contrib/debianfhemde/debianfhemde/html/stable.html create mode 100644 fhem/contrib/debianfhemde/debianfhemde/nightly/.gitkeep create mode 100644 fhem/contrib/debianfhemde/debianfhemde/robots.txt create mode 100644 fhem/contrib/debianfhemde/debianfhemde/stable/.gitkeep create mode 100755 fhem/contrib/debianfhemde/debianfhemde/style/style.css create mode 100755 fhem/contrib/debianfhemde/scripts/mkfhemnightly create mode 100755 fhem/contrib/debianfhemde/scripts/mkfhemstable create mode 100755 fhem/contrib/debianfhemde/scripts/templates/index.template create mode 100755 fhem/contrib/debianfhemde/scripts/templates/manual.template create mode 100755 fhem/contrib/debianfhemde/scripts/templates/nightly.template diff --git a/fhem/contrib/debianfhemde/README b/fhem/contrib/debianfhemde/README new file mode 100644 index 000000000..4427ac381 --- /dev/null +++ b/fhem/contrib/debianfhemde/README @@ -0,0 +1,97 @@ +-------------------------------------------------------------------------------- + +Nutzung der Skripte zur Erstellung und Pflege von http://debian.fhem.de + +$Id:$ + +-------------------------------------------------------------------------------- + +Annahmen: + +1. der gesamte Ordner liegt im home-Verzeichnis eines Linux Users +2. der Linux User benötigt root-Rechte auf die Befehle rm und chown + Eintrag in /etc/sudoers für user debianfhemde: + debianfhemde ALL = NOPASSWD: /bin/chown, /bin/rm + +3. der gpg key für das Signieren wurde erstellt + $ gpg --gen-key + + und der öffentliche Teil wurde nach ./debianfhemde/archive.key exportiert + $ gpg --armor --export "" > ~/debianfhemde/archive.key + + Tipp: Man sollte auch eine Widerrufsurkunde erstellen und sicher verwahren: + $ gpg --output revoke.asc --gen-revoke "" + +-------------------------------------------------------------------------------- + +Erstellung des stable Repository + +1. das aktuelle fhem.deb muss von http://fhem.de geladen werden, + diese Datei kommt in das Verzeichnis ./debianfhemde/stable + +2. die Datei muss auch in ./debianfhemde verfügbar sein, + entweder als symlink auf die Datei in stable oder als Kopie + (AWS S3 unterstützt beispielsweise keine Links!) + +3. ./scripts/mkfhemstable muss einmalig ausgeführt werden + +-------------------------------------------------------------------------------- + +Erstellung des nightly Repository + +1. fhem muss erstmalig manuell aus SVN nach fhem.svn ausgecheckt werden + +2. in ./scripts/mkfhemnightly muss am Ende des Skripts die Synchronisation geprüft und ggf. angepaßt werden + +3. ./scripts/mkfhemnightly einmalig ausführen, um alle benötigten Dateien initial zu erstellen + und um zu testen, ob der gesamte Ablauf korrekt funktioniert + +4. cronjob einplanen, um die Generierung täglich auszuführen + (Empfehlung: morgens um 8 Uhr, damit das nightly build weitestgehend mit dem offiziellen update übereinstimmt) + +-------------------------------------------------------------------------------- + +Komplette Baumstruktur: + +debianfhemde/ +|-- archive.key +|-- fhem-5.8.deb +|-- grafik +| |-- favicon.ico +| `-- fhemicon.png +|-- html +| |-- default.html +| |-- gpg_trouble.html +| |-- https_trouble.html +| |-- manual.html +| |-- nightly.html +| `-- stable.html +|-- index.html +|-- nightly +| |-- Packages +| |-- Release +| |-- Release.gpg +| `-- fhem-5.8.deb +|-- robots.txt +|-- stable +| |-- Packages +| |-- Release +| |-- Release.gpg +| `-- fhem-5.8.deb +`-- style + `-- style.css +scripts/ +|-- mkfhemnightly +|-- mkfhemstable +`-- templates + |-- index.template + |-- major.shtml + |-- manual.template + |-- nightly.template + `-- nversion.shtml + +-------------------------------------------------------------------------------- + +2017-02-25 - betateilchen + +-------------------------------------------------------------------------------- diff --git a/fhem/contrib/debianfhemde/debianfhemde/grafik/favicon.ico b/fhem/contrib/debianfhemde/debianfhemde/grafik/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..0c9725f4b96725820d0f148404264c6d0c9d2007 GIT binary patch literal 2238 zcmeHHdr(wm6#p$3cV*02O+s)CbxeVoa3)2@M=fGL&@96db-1ibtXfh&ax67p;bU~v zaiH1d-fzCkYE#;jJ*KJ2SJ_yGnu>~x$ZOeM77P;<6&8f;+}*uqj{VVJ{nObw`+ev4 zJLi1oobTQX=;$|S5a_=r4)z3|1`tn55K>81{2%2!F&9WnNiULK3PV^KAYAT=9u7c% zuTSC7K;*CybFN)r+)Cu3CQL?l6~x(rI+^T!v_C-m{m7~Nfb4_F^}J8^r?mePI@f1-%ew_|AH}l9ZGh((;3~m} zh6383!F!EX2rdWKHti+*64w4+L~8{$U*}lYB$2NNsJ}*7Ep}YrPkFq^Zz?9tiM}f5 zX#l(~M7iq;Yeclii{WmBJOw9g;mB2;LU# zzVQVzyl(J64x^~~JLERHQQUkCa?6jfw;ad5=96HpN3g&7EIzvR3;6BR__(zMpSPaF zfjgx*bmu(2ZLPppcOCfpUOB$MSB1lE)%d2(i6iYb_^Hi>qdq52`aC%9YrxMP_4uLv zCeHb8;gs(VPIR{5ROd~UblkF+`v+5gLbI|2K@mKF9zX3>(D{g}W7c8kR_cY5l`#MtPZ zzxd3hqFG!#d-~KDlLkZ?B815P14oBjG+xY{ot_kHGztbmh)G$#l`9HkiY`mzvk4zO zY1xj#0+}&MW}GugD(;o~X2?MlHYf^boLI&s;%H$?T#^=Vj$T4Im${@U>sPP;P_fdU zCl4`e4)LQ1VX~B;pc4!cVZ-umvLsK6)@XBD43{O&GlZdg6s{Bu?Xi(F+w1*A%^_Wo z=-gak51qnjyV6j|Y-@}U8q5@m7_;ft%2Xj&i;OXGmM`RK@uG3BBrT6r=nTq3N#2EG zV}cehX6m;yHY-jIr2#M|TUike=rt`q)3A;4S;J`rk`$_Y>LP-#0OJ|f|V||aMiFe>eUvg zb6{+z-Z(BmN7+STXW)JnYEbQgL{i2GX#skMUY}-IFH><8r{29Pl9XVW9(Y3E5XD4e zc&?2aP~+6hRDDsTG4H|si#bUK!)kT(B-A~(S%qke*1g)o;;eB(@0rDc1e9itkfik< z8j)QT#|io=ij@lFQ-omQ8W&g>iI$PQ!>7?xm?BJlG&<-h=8ZLm&l}k9p*QDmDeU$I zV!FO>&eBKFhfQ<#I~Vm#%W5Nx{nOm>Z)ol mir0|}rGQ}*VF>z}+5!6N>*%X5`2EgEzrUTd+e9aC^#2K3L|yd& literal 0 HcmV?d00001 diff --git a/fhem/contrib/debianfhemde/debianfhemde/grafik/fhemicon.png b/fhem/contrib/debianfhemde/debianfhemde/grafik/fhemicon.png new file mode 100755 index 0000000000000000000000000000000000000000..3a1223a288539b8d14ffe9c5cb1ec2fda2f47c13 GIT binary patch literal 5733 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 XJWu3ixsmhn00000NkvXXu0mjfgwzMO literal 0 HcmV?d00001 diff --git a/fhem/contrib/debianfhemde/debianfhemde/html/default.html b/fhem/contrib/debianfhemde/debianfhemde/html/default.html new file mode 100755 index 000000000..953626868 --- /dev/null +++ b/fhem/contrib/debianfhemde/debianfhemde/html/default.html @@ -0,0 +1,21 @@ + + + + + + + + + +

Several ways to install FHEM on Debian-based systems

+ + All procedures are intended to create FHEM installations from scratch.
+ Do not use these procedures for updates/upgrades!
+
+gpg key changed on 2016-12-26,
+see section "gpg key Trouble" in navigation bar for further details. + + + diff --git a/fhem/contrib/debianfhemde/debianfhemde/html/gpg_trouble.html b/fhem/contrib/debianfhemde/debianfhemde/html/gpg_trouble.html new file mode 100755 index 000000000..7167b1e3c --- /dev/null +++ b/fhem/contrib/debianfhemde/debianfhemde/html/gpg_trouble.html @@ -0,0 +1,43 @@ + + + + + + + + + + + +

Having trouble in use of apt-get update?

+ +
    +
    + If you get an error like this: GPG-Fehler:
    +
    + http://debian.fhem.de/ / Release: [...] NO_PUBKEY xxxxxxxx
    +
+ +
    + Try the following steps:
    +
    +
  • Find the old gpg key

    +
      sudo apt-key list
      +
      + pub 2048R/BF0E6825 2014-10-05 [verfällt: 2024-10-02]
      +uid "..." (betateilchen) <repo@betateilchen.de>

    • +
  • Delete the old key identified in previos step

    +
      sudo apt-key del BF0E6825

    • +
  • Import new gpg key

    +
      wget -qO - http://debian.fhem.de/archive.key | sudo apt-key add -

    • +
  • Check result

    +
      sudo apt-key list
      +
      +pub 4096R/CC0B9B66 2016-12-26 [verfällt: 2021-12-25]
      +uid betateilchen (debian.fhem.de) <gpg@betateilchen.de>

+
+ + + diff --git a/fhem/contrib/debianfhemde/debianfhemde/html/https_trouble.html b/fhem/contrib/debianfhemde/debianfhemde/html/https_trouble.html new file mode 100755 index 000000000..9cf4071a6 --- /dev/null +++ b/fhem/contrib/debianfhemde/debianfhemde/html/https_trouble.html @@ -0,0 +1,28 @@ + + + + + + + + + + + +

Having trouble when connecting apt via https?

+
    + Try the following steps:
    +
    +
  • Importing repository gpg key fails (with certificate or gpg error)

    +
      wget --no-check-certificate -qO - https://debian.fhem.de/archive.key | apt-key add -

    • +
  • apt-get update fails with "no driver for https"

    +
      apt-get install apt-transport-https

    • +
  • apt-get update still fails becaus of https

    +
      echo 'Acquire::https::debian.fhem.de::Verify-Peer "false";' > /etc/apt/apt.conf.d/30nohttps

    • +
+
+ + + diff --git a/fhem/contrib/debianfhemde/debianfhemde/html/stable.html b/fhem/contrib/debianfhemde/debianfhemde/html/stable.html new file mode 100755 index 000000000..355d1bac5 --- /dev/null +++ b/fhem/contrib/debianfhemde/debianfhemde/html/stable.html @@ -0,0 +1,30 @@ + + + + + + + + + + + +

Use aptitude to install fhem (stable package from current release) and all dependencies

+
    +
  • Import repository gpg key:

    +
      wget -qO - http://debian.fhem.de/archive.key | apt-key add -

    • +
  • Add repository to /etc/apt/sources.list:

    +
      deb http://debian.fhem.de/stable/ /

    • +
  • Update your package administration:

    +
      apt-get update

    • +
  • Install fhem:

    +
      apt-get install fhem

    • +
  • (optional) Remove repository from /etc/apt/sources.list:

    +
      #deb http://debian.fhem.de/stable/ /

    • +
+
+ + + diff --git a/fhem/contrib/debianfhemde/debianfhemde/nightly/.gitkeep b/fhem/contrib/debianfhemde/debianfhemde/nightly/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/fhem/contrib/debianfhemde/debianfhemde/robots.txt b/fhem/contrib/debianfhemde/debianfhemde/robots.txt new file mode 100644 index 000000000..6ffbc308f --- /dev/null +++ b/fhem/contrib/debianfhemde/debianfhemde/robots.txt @@ -0,0 +1,3 @@ +User-agent: * +Disallow: / + diff --git a/fhem/contrib/debianfhemde/debianfhemde/stable/.gitkeep b/fhem/contrib/debianfhemde/debianfhemde/stable/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/fhem/contrib/debianfhemde/debianfhemde/style/style.css b/fhem/contrib/debianfhemde/debianfhemde/style/style.css new file mode 100755 index 000000000..3d59067f9 --- /dev/null +++ b/fhem/contrib/debianfhemde/debianfhemde/style/style.css @@ -0,0 +1,80 @@ +body { background-color: #FFFFE7; + font-family:Arial, sans-serif; font-size:16px;} +input { font-family:Arial, sans-serif; font-size:16px; } +select { font-family:Arial, sans-serif; font-size:16px; } + +#aws { margin-top:10px; margin-left:30px; width:120px; height:45px; + content:url(../grafik/aws.png); } +#logo { margin-top:10px; margin-left:30px; width:120px; height:132px; + background-image:url(../grafik/fhemicon.png); } +#menu { margin-top:10px; margin-left:20px; width:140px; } +#menuScrollArea { width: 175px; left:0px; top:0px; height:100%; + position:fixed; overflow-x:hidden; overflow-y:auto; } + +#hdr { position:absolute; top:10px; left:180px; } +#content { position:absolute; top:50px; left:180px; bottom:20px; right:10px; } + +#connect_err { background-color: #000000; color: #FFFFFF; + position:absolute; top:0px; left:40px; z-index: 10; } +.devType { padding-top:20px; } + +a { color: #278727; } +p.a { color: #278727; } + +img { border-style: none; } + +.wide { width:100%; } + +table.block { border:1px solid gray; background: #F8F8E0; } +table.block tr.odd { background: #F0F0D8; } +table.block tr.sel { background: #F0F0D8; } +table { border-radius:8px; } + +table.room { border:1px solid gray; width: 100%; background: #D7FFFF; } +table.room tr.sel { background: #A0FFFF; } + +#right { position:absolute; top:0px; left:180px; width:80%; height:100%; } + +h2,h3,h4 { color:#52865D; line-height:1.3; + margin-top:1.5em; font-family:Arial,Sans-serif; } +div.dist { padding-top:0.3em; } +div.clock { } +button.dist { margin:10px; background:transparent; border:0px; cursor:pointer; } + +a img { border-style:none; } +.col2 { text-align:center; } + +/* detail-selector & slider */ +.makeTable { display:inline; float:left; clear:left; + margin-top:10px; margin-bottom:20px;} +.makeSelect { display:inline; float:left; clear:left; } + +select { margin-left:5px; margin-right:5px; } +.get,.set,.attr { margin-bottom:5px; float:left; } +.slider { float:left; width:250px; height:26px; } + +/* detail only */ +.makeSelect .slider {background:#F0F0D8; border-radius:8px;} + +/* timepicker */ +.set .set { margin-bottom:2px; margin-top:3px; } + +.handle { position:relative; cursor:pointer; width:50px; + height:20px; line-height:20px; + -webkit-user-select:none; -moz-user-select:none; -user-select:none; + border:3px solid; color:#278727; text-align:center; } +.downText { margin-top:2px; } + +pre { white-space: pre-wrap; } + +svg { height:32px; width:32px; fill:#278727; } +svg.on,svg.FS20_on { fill:orange; } + +/* next lines are for remotecontrol */ +.rc_body { border-style: solid; border-color: gray; border-width: 2px; padding: 5px; + background: #C8C8B0; font-size:6px;} +.rc_button { padding: 5px 7px;} +.rc_button img { border-style: solid; border-width: 1px; border-color: transparent; } +.rc_button img:active { border-color: gray; } + +.changed { color:red; } diff --git a/fhem/contrib/debianfhemde/scripts/mkfhemnightly b/fhem/contrib/debianfhemde/scripts/mkfhemnightly new file mode 100755 index 000000000..6f42fc2a9 --- /dev/null +++ b/fhem/contrib/debianfhemde/scripts/mkfhemnightly @@ -0,0 +1,63 @@ +#!/bin/sh +# +# create nightly build and transfer it to static webspace +# (C) 2013-2017 betateilchen +# + +clear + +# remove old version infos +# +rm ~/scripts/templates/nversion.shtml +rm ~/scripts/templates/major.shtml + + +# update svn repo +# +cd ~/fhem.svn +svn update + + +# replace version infos in various html files +# because Amazon S3 does not support shtml +# +svn info | grep 'Revision' | awk '{ print $2; }' > ~/scripts/templates/nversion.shtml +cat Makefile |grep '^VERS=' |sed 's/VERS=//' |sed 's/\r//' > ~/scripts/templates/major.shtml + +cd ~/scripts +cp templates/index.template index.html +sed -i s/==MINOR==/`cat templates/nversion.shtml`/g index.html +mv index.html ../debianfhemde/ + +cp templates/nightly.template nightly.html +sed -i s/==MAJOR==/`cat templates/major.shtml`/g nightly.html +sed -i s/==MINOR==/`cat templates/nversion.shtml`/g nightly.html +mv nightly.html ../debianfhemde/html/ +B +cp templates/manual.template manual.html +sed -i s/==MAJOR==/`cat templates/major.shtml`/g manual.html +mv manual.html ../debianfhemde/html/ + + +# build nightly deb package +# +cd ~/fhem.svn +make deb +mv fhem-5.8.deb ~/debianfhemde/nightly + + +# create package informations for aptitude +# and sign all the stuff +# +cd ~/debianfhemde/nightly +apt-ftparchive packages . > Packages +apt-ftparchive release . > Release +gpg --batch --yes --passphrase anton1142 --output Release.gpg -bas Release + +# sync to Amazon S3 Instance +# +cd ~/debianfhemde +aws s3 sync . s3://debian.fhem.de --delete + +### + diff --git a/fhem/contrib/debianfhemde/scripts/mkfhemstable b/fhem/contrib/debianfhemde/scripts/mkfhemstable new file mode 100755 index 000000000..2c5a758b0 --- /dev/null +++ b/fhem/contrib/debianfhemde/scripts/mkfhemstable @@ -0,0 +1,6 @@ +#!/bin/sh + +cd ~/debianfhemde/stable +apt-ftparchive packages . > Packages +apt-ftparchive release . > Release +gpg --batch --yes --passphrase anton1142 --output Release.gpg -bas Release diff --git a/fhem/contrib/debianfhemde/scripts/templates/index.template b/fhem/contrib/debianfhemde/scripts/templates/index.template new file mode 100755 index 000000000..c947f37fb --- /dev/null +++ b/fhem/contrib/debianfhemde/scripts/templates/index.template @@ -0,0 +1,53 @@ + + +FHEM for Debian + + + + + + + + + + + + + + diff --git a/fhem/contrib/debianfhemde/scripts/templates/manual.template b/fhem/contrib/debianfhemde/scripts/templates/manual.template new file mode 100755 index 000000000..2df47b6e3 --- /dev/null +++ b/fhem/contrib/debianfhemde/scripts/templates/manual.template @@ -0,0 +1,32 @@ + + + + + + + + + + + +

Manual installation from console

+
    +
  • Install prerequisits:

    +
      apt-get -y install perl-base libdevice-serialport-perl libwww-perl libio-socket-ssl-perl libcgi-pm-perl libjson-perl sqlite3 libdbd-sqlite3-perl libtext-diff-perl libtimedate-perl libmail-imapclient-perl libgd-graph-perl libtext-csv-perl libxml-simple-perl liblist-moreutils-perl ttf-liberation libimage-librsvg-perl libgd-text-perl libsocket6-perl libio-socket-inet6-perl libmime-base64-perl libimage-info-perl libusb-1.0-0-dev libnet-server-perl

    • +
  • Download latest stable package:

    +
      wget http://debian.fhem.de/fhem-==MAJOR==.deb

    • +
  • Install package:

    +
      dpkg -i fhem.deb

    • +
  • If you want to add the fhem user manually, just run the following command::

    +
      useradd --system --home /opt/fhem --gid dialout --shell /bin/false fhem

    • +
  • You can find the init-script as /opt/fhem/contrib/init-scripts/fhem.3 and copy this to /etc/init.d/fhem

    +
      cp /opt/fhem/contrib/init-scripts/fhem.3 /etc/init.d/fhem
      + chmod a+x /etc/init.d/fhem
      + update-rc.d fhem defaults
    • +
+
+ + + diff --git a/fhem/contrib/debianfhemde/scripts/templates/nightly.template b/fhem/contrib/debianfhemde/scripts/templates/nightly.template new file mode 100755 index 000000000..9771c066b --- /dev/null +++ b/fhem/contrib/debianfhemde/scripts/templates/nightly.template @@ -0,0 +1,33 @@ + + + + + + + + + + + +

Nightly builds (use it at your own risk!)

+
    +
  • Import repository gpg key:

    +
      wget -qO - http://debian.fhem.de/archive.key | apt-key add -

    • +
  • Add repository to /etc/apt/sources.list:

    +
      deb http://debian.fhem.de/nightly/ /

    • +
  • Update your package administration:

    +
      apt-get update

    • +
  • Install fhem:

    +
      apt-get install fhem

    • +
  • You will find a special version number like

    +
      Inst fhem (==MAJOR==.==MINOR== debian.fhem.de [all])

    +
      with ==MAJOR== representing major version
    +
      with ==MINOR== representing the latest SVN commit included.

    +
  • (optional) Remove repository from /etc/apt/sources.list:

    +
      #deb http://debian.fhem.de/nightly/ /

    • +
+
+ +