From 596a7c444f8aeac8f4a2b92384141d661ce31070 Mon Sep 17 00:00:00 2001 From: stephen mahood Date: Mon, 22 Dec 2014 13:14:16 -0500 Subject: [PATCH] added rsyslog- & syslog-ng to FAIBASE and altere ikiwiki a bit --- package_config/FAIBASE | 4 +++- package_config/IKIWIKI | 3 ++- scripts/IKIWIKI/20-setup-ikiwiki | 10 ++++++++++ scripts/IKIWIKI/30-setup-directory | 9 +++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 scripts/IKIWIKI/20-setup-ikiwiki create mode 100644 scripts/IKIWIKI/30-setup-directory diff --git a/package_config/FAIBASE b/package_config/FAIBASE index a6cfe20..ac1aece 100644 --- a/package_config/FAIBASE +++ b/package_config/FAIBASE @@ -26,4 +26,6 @@ pciutils usbutils lvm2 git manpages -man-db \ No newline at end of file +man-db +rsyslogd- +syslog-ng diff --git a/package_config/IKIWIKI b/package_config/IKIWIKI index 438385a..3cc47c4 100644 --- a/package_config/IKIWIKI +++ b/package_config/IKIWIKI @@ -5,4 +5,5 @@ libdatetime-format-dateparse-perl ikiwiki gcc libc-dev - +librpc-xml-perl +python-docutils diff --git a/scripts/IKIWIKI/20-setup-ikiwiki b/scripts/IKIWIKI/20-setup-ikiwiki new file mode 100644 index 0000000..76c77d9 --- /dev/null +++ b/scripts/IKIWIKI/20-setup-ikiwiki @@ -0,0 +1,10 @@ +#!/bin/sh + +# Detect if ikikwiki is already installed +if [ ! -e /etc/ikiwiki/ikiwiki.setup ]; then + # copy ikiwiki config + fcopy -v /etc/ikiwiki/ikiwiki.setup + + # run setup + $ROOTCMD ikiwiki --setup /etc/ikiwiki/ikiwiki.setup/DEFAULT +fi diff --git a/scripts/IKIWIKI/30-setup-directory b/scripts/IKIWIKI/30-setup-directory new file mode 100644 index 0000000..d46ed17 --- /dev/null +++ b/scripts/IKIWIKI/30-setup-directory @@ -0,0 +1,9 @@ +#!/bin/sh + +$ROOTCMD mkdir /srv/git # create the git source directory + +$ROOTCMD mv /root/gluestick.git /srv/git/ # move the git source to the new directory +$ROOTCMD mv /root/public_html/gluestick /var/www/html # move the public html files to the var location +$ROOTCMD mv /root/gluestick /srv/ # move the source into location + + -- 2.25.1