# Create empty logs dir

	@${MKDIR} ${STAGEDIR}/${WWWDIR}/logs

# Make daily.sh executable

	@${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh

	@${ECHO} @dir ${WWWDIR}/logs >> ${TMPPLIST}

--- config.php.default.orig	2017-03-26 12:06:00 UTC

+++ config.php.default

@@ -10,7 +10,7 @@ $config['db_name'] = 'librenms';

 // This is the user LibreNMS will run as

 //Please ensure this user is created and has the correct permissions to your install

-$config['user'] = 'librenms';

+$config['user'] = 'www';

 ### This should *only* be set if you want to *force* a particular hostname/port

 ### It will prevent the web interface being usable form any other hostname

--- daily.sh.orig	2017-03-26 12:06:00 UTC

+++ daily.sh

@@ -113,7 +113,7 @@ main () {

         # only try to su if we are root (or sudo)

         if [[ "$EUID" -eq 0 ]]; then

             echo "Re-running ${DAILY_SCRIPT} as ${LIBRENMS_USER} user"

-            su -l "$LIBRENMS_USER" -c "$DAILY_SCRIPT $@"

+            sudo -u "$LIBRENMS_USER" "$DAILY_SCRIPT"

             exit;

         fi

@@ -123,27 +123,6 @@ main () {

     fi

     if [[ -z "$arg" ]]; then

-        up=$(php daily.php -f update >&2; echo $?)

-        if [[ "$up" == "0" ]]; then

-            $DAILY_SCRIPT no-code-update

-            exit

-        elif [[ "$up" == "1" ]]; then

-            # Update to Master-Branch

-            old_ver=$(git show --pretty="%H" -s HEAD)

-            status_run 'Updating to latest codebase' 'git pull --quiet' 'update'

-            new_ver=$(git show --pretty="%H" -s HEAD)

-            if [ "$old_ver" != "$new_ver" ]; then

-                status_run "Updated from $old_ver to $new_ver" ''

-            fi

-        elif [[ "$up" == "3" ]]; then

-            # Update to last Tag

-            old_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))

-            status_run 'Updating to latest release' 'git fetch --tags && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))' 'update'

-            new_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))

-            if [[ "$old_ver" != "$new_ver" ]]; then

-                status_run "Updated from $old_ver to $new_ver" ''

-            fi

-        fi

         cnf=$(echo $(grep '\[.distributed_poller.\]' config.php | egrep -v -e '^//' -e '^#' | cut -d = -f 2 | sed 's/;//g'))

         if ((${BASH_VERSINFO[0]} < 4)); then

@@ -167,7 +146,6 @@ main () {

             post-pull)

                 # List all tasks to do after pull in the order of execution

                 status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'

-                status_run 'Updating submodules' "$DAILY_SCRIPT submodules"

                 status_run 'Cleaning up DB' "$DAILY_SCRIPT cleanup"

                 status_run 'Fetching notifications' "$DAILY_SCRIPT notifications"

                 status_run 'Caching PeeringDB data' "$DAILY_SCRIPT peeringdb"

--- validate.php.orig	2017-04-11 18:45:34 UTC

+++ validate.php

@@ -108,13 +108,6 @@ if (!($username === 'root' || (isset($co

     print_fail('You need to run this script as root' . (isset($config['user']) ? ' or '.$config['user'] : ''));

 }

-if ($git_found === true) {

-    if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) {

-        $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get()));

-        print_warn("Your install is out of date, last update: " . $commit_date->format('r'));

-    }

-}

-

 // Check php modules we use to make sure they are loaded

 $extensions = array('pcre','curl','session','snmp','mcrypt');

 foreach ($extensions as $extension) {

@@ -302,22 +295,6 @@ if (dbFetchCell('SELECT COUNT(*) FROM `d

 }

-if ($git_found === true) {

-    if ($versions['local_branch'] != 'master') {

-        print_warn("Your local git branch is not master, this will prevent automatic updates.");

-    }

-

-    // check for modified files

-    $modifiedcmd = 'git diff --name-only --exit-code';

-    if ($username === 'root') {

-        $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';

-    }

-    exec($modifiedcmd, $cmdoutput, $code);

-    if ($code !== 0 && !empty($cmdoutput)) {

-        print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");

-        print_list($cmdoutput, "\t %s\n");

-    }

-}

 // Modules test

 $modules = explode(',', $options['m']);

 foreach ($modules as $module) {

*/5 	*	*	*	*	www	%%PHP%% %%WWWDIR%%/poll-billing.php >> /dev/null 2>&1

01	*	*	*	*	www	%%PHP%% %%WWWDIR%%/billing-calculate.php >> /dev/null 2>&1

*/5	*	*	*	*	www	%%PHP%% %%WWWDIR%%/check-services.php >> /dev/null 2>&1