From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Tue, 11 Jun 2019 23:58:48 +0000 (-0500)
Subject: Merge branch 'systemd'
X-Git-Tag: v0.0.2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fb1de2737d66a80014ae906813f253236abcd99;p=thirdparty%2FFORT-validator.git

Merge branch 'systemd'
---

7fb1de2737d66a80014ae906813f253236abcd99
diff --cc docs/doc/installation.md
index 939db34c,212e8944..a5e261a4
--- a/docs/doc/installation.md
+++ b/docs/doc/installation.md
@@@ -37,16 -28,41 +28,42 @@@ The dependencies ar
  3. libcrypto (Either [LibreSSL](http://www.libressl.org/) or [OpenSSL](https://www.openssl.org/))
  4. [rsync](http://rsync.samba.org/)
  
- There's also [autoconf](https://www.gnu.org/software/autoconf/), [automake](https://www.gnu.org/software/automake/) and unzip (or [git](https://git-scm.com/)), but those are only needed for installation paperwork.
+ The build dependencies are
  
- ## Debian-based distributions
+ - [autoconf](https://www.gnu.org/software/autoconf/)
++- [automake](https://www.gnu.org/software/automake/)
+ - unzip (or [git](https://git-scm.com/))
  
- I haven't actually tried this in all the Debian-based distributions. Tested in Ubuntu 18.
+ (Some builds do not need all these dependencies.)
+ 
+ ## Option 1: Installing the Debian package
+ 
+ > TODO Upload to Debian, add more archs and/or host these links on Github releases properly.
+ 
+ {% highlight bash %}
+ wget https://www.dropbox.com/s/dbdhn4yd9m3nnct/libcmscodec1_0.0.1-1_amd64.deb
+ wget https://www.dropbox.com/s/7c0rs49ewcu6m93/fort_0.0.1-1_amd64.deb
+ sudo apt install ./libcmscodec1_0.0.1-1_amd64.deb ./fort_0.0.1-1_amd64.deb
+ {% endhighlight %}
+ 
+ Aside from the `fort` binary documented elsewhere in this documentation, the Debian package also ships with a systemd service, which you can [configure](usage.html#--configuration-file) at `/etc/fort/config.json`.
+ 
+ {% highlight bash %}
+ sudo service fort start
+ service fort status
+ tail /var/log/syslog
+ sudo service fort stop
+ {% endhighlight %}
+ 
+ etc.
+ 
+ ## Option 2: Compiling and installing the release tarball
+ 
+ ### Debian version
  
  {% highlight bash %}
  ########### normal dependencies ###########
- # autoconf 2.69 or higher, please.
 -sudo apt install autoconf build-essential libjansson-dev libssl-dev pkg-config rsync unzip
 +sudo apt install autoconf automake build-essential libjansson-dev libssl-dev pkg-config rsync unzip
  
  ############### libcmscodec ###############
  mkdir libcmscodec
@@@ -117,3 -134,38 +135,39 @@@ make instal
  exit
  cd ../../
  {% endhighlight %}
+ 
+ ## Option 3: Compiling the git repositories
+ 
+ {% highlight bash %}
+ ########### normal dependencies ###########
 -sudo apt install autoconf build-essential git libjansson-dev libssl-dev pkg-config rsync
++sudo apt install autoconf automake build-essential git libjansson-dev libssl-dev pkg-config rsync
+ 
+ ################## asn1c ##################
+ # (Needed by libcmscodec's autogen. Relatively recent commit required.)
+ git clone https://github.com/vlm/asn1c.git
+ cd asn1c
+ test -f configure || autoreconf -iv
+ ./configure
+ make
+ sudo make install
+ 
+ ############### libcmscodec ###############
+ git clone https://github.com/NICMx/libcmscodec.git
+ cd libcmscodec/
+ ./autogen.sh
+ ./configure
+ make
+ sudo make install
+ sudo ldconfig
+ cd ../
+ 
+ ################## fort ###################
+ git clone https://github.com/NICMx/FORT-validator.git
+ cd FORT-validator/
+ ./autogen.sh
+ ./configure
+ make
+ sudo make install
+ cd ../
+ {% endhighlight %}
++