From c003848b8fe05ec699d2c8e1aefa951a6db5d869 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Sun, 31 Dec 2017 06:30:22 +0100
Subject: [PATCH] Refactored resources packages.

---
 resources/{ => conf}/hedbobot-sample.conf     | 12 +++++-----
 .../log4j-default.properties}                 |  0
 resources/{ => conf}/users-sample.conf        |  0
 resources/scripts/daemon.sh                   | 23 -------------------
 resources/{ => scripts}/hebdobot.cron         |  0
 resources/{ => scripts}/hebdobot.initd        |  0
 6 files changed, 6 insertions(+), 29 deletions(-)
 rename resources/{ => conf}/hedbobot-sample.conf (100%)
 rename resources/{log4j.properties => conf/log4j-default.properties} (100%)
 rename resources/{ => conf}/users-sample.conf (100%)
 delete mode 100644 resources/scripts/daemon.sh
 rename resources/{ => scripts}/hebdobot.cron (100%)
 rename resources/{ => scripts}/hebdobot.initd (100%)

diff --git a/resources/hedbobot-sample.conf b/resources/conf/hedbobot-sample.conf
similarity index 100%
rename from resources/hedbobot-sample.conf
rename to resources/conf/hedbobot-sample.conf
index e664c53..0cccc3e 100644
--- a/resources/hedbobot-sample.conf
+++ b/resources/conf/hedbobot-sample.conf
@@ -14,18 +14,18 @@ hebdobot.irc.channel=#april-test
 # Pastebin settings. 
 #hebdobot.pastebin.apiKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
-# Ident.ca settings.
-#hebdobot.identica.apiKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-#hebdobot.identica.apiSecret=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-#hebdobot.identica.tokenKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-#hebdobot.identica.tokenSecret=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
 # Twitter settings.
 #hebdobot.twitter.consumerKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 #hebdobot.twitter.consumerSecret=XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 #hebdobot.twitter.accessToken=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 #hebdobot.twitter.accessTokenSecret=XXXXXXXXXXXXXXXXXXXXXXXXXX
 
+# Ident.ca settings.
+#hebdobot.identica.apiKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+#hebdobot.identica.apiSecret=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+#hebdobot.identica.tokenKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+#hebdobot.identica.tokenSecret=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
 # Notifications
 #notify.at5.cron=0 55 11 ? * *
 #notify.at5.irc=Revue hebdomadaire dans 5 minutes
diff --git a/resources/log4j.properties b/resources/conf/log4j-default.properties
similarity index 100%
rename from resources/log4j.properties
rename to resources/conf/log4j-default.properties
diff --git a/resources/users-sample.conf b/resources/conf/users-sample.conf
similarity index 100%
rename from resources/users-sample.conf
rename to resources/conf/users-sample.conf
diff --git a/resources/scripts/daemon.sh b/resources/scripts/daemon.sh
deleted file mode 100644
index 66af092..0000000
--- a/resources/scripts/daemon.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-NAME=hebdobot
-BASE_DIR=$HOME/$NAME
-PID_FILE=$BASE_DIR/$NAME.pid
-DAEMON=java
-DAEMON_ARGS="-cp *:lib/* org.april.hebdobot"
-
-CMD="/sbin/start-stop-daemon --chdir $BASE_DIR --quiet --make-pidfile --pidfile $PID_FILE --exec $DAEMON"
-case "$1" in
-	start)
-		echo "Starting $NAME"
-		$CMD --start --test || exit 1
-		$CMD --start --background -- $DAEMON_ARGS || exit 2
-		echo "$NAME started"
-		;;
-	stop)
-		echo "Stopping $NAME"
-		$CMD --stop || exit 3
-		rm -f $PID_FILE
-		echo "$NAME stopped"
-		;;
-esac
diff --git a/resources/hebdobot.cron b/resources/scripts/hebdobot.cron
similarity index 100%
rename from resources/hebdobot.cron
rename to resources/scripts/hebdobot.cron
diff --git a/resources/hebdobot.initd b/resources/scripts/hebdobot.initd
similarity index 100%
rename from resources/hebdobot.initd
rename to resources/scripts/hebdobot.initd