From 53a5f5a2430f248223dd6598fed9e68dd0d742ef Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Sat, 13 Oct 2012 18:48:24 +0300 Subject: [PATCH] Use directory /usr/lib/uhub/ instead of /var/lib/uhub/ in according with FHS (Filesystem Hierarchy Standard). --- CMakeLists.txt | 2 +- doc/plugins.conf | 10 +++++----- doc/uhub.spec | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59c5cb1..a08ad4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,7 +196,7 @@ endif() if (UNIX) install( TARGETS uhub RUNTIME DESTINATION bin ) - install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic DESTINATION /var/lib/uhub/ OPTIONAL ) + install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic DESTINATION /usr/lib/uhub/ OPTIONAL ) install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL ) if (SQLITE_SUPPORT) diff --git a/doc/plugins.conf b/doc/plugins.conf index e45f35c..491eb74 100644 --- a/doc/plugins.conf +++ b/doc/plugins.conf @@ -11,7 +11,7 @@ # Parameters: # file: path/filename for database. # -plugin /var/lib/uhub/mod_auth_sqlite.so "file=/etc/uhub/users.db" +plugin /usr/lib/uhub/mod_auth_sqlite.so "file=/etc/uhub/users.db" # Log file writer @@ -19,10 +19,10 @@ plugin /var/lib/uhub/mod_auth_sqlite.so "file=/etc/uhub/users.db" # Parameters: # file: path/filename for log file. # syslog: if true then syslog is used instead of writing to a file (Unix only) -plugin /var/lib/uhub/mod_logging.so "file=/var/log/uhub.log" +plugin /usr/lib/uhub/mod_logging.so "file=/var/log/uhub.log" # A simple example plugin -# plugin /var/lib/uhub/mod_example.so +# plugin /usr/lib/uhub/mod_example.so # A plugin sending a welcome message. # # This plugin provides the following commands: @@ -46,7 +46,7 @@ plugin /var/lib/uhub/mod_logging.so "file=/var/log/uhub.log" # %p - 'am' or 'pm' # %M - Minutes (00-59) (Hub local time) # %S - Seconds (00-60) (Hub local time) -plugin /var/lib/uhub/mod_welcome.so "motd=/etc/uhub/motd.txt rules=/etc/uhub/rules.txt" +plugin /usr/lib/uhub/mod_welcome.so "motd=/etc/uhub/motd.txt rules=/etc/uhub/rules.txt" # Load the chat history plugin. # @@ -58,5 +58,5 @@ plugin /var/lib/uhub/mod_welcome.so "motd=/etc/uhub/motd.txt rules=/etc/uhub/rul # history_max: the maximum number of messages to keep in history # history_default: when !history is provided without arguments, then this default number of messages are returned. # history_connect: the number of chat history messages to send when users connect (0 = do not send any history) -plugin /var/lib/uhub/mod_chat_history.so "history_max=200 history_default=10 history_connect=5" +plugin /usr/lib/uhub/mod_chat_history.so "history_max=200 history_default=10 history_connect=5" diff --git a/doc/uhub.spec b/doc/uhub.spec index 7c14237..7a487f9 100644 --- a/doc/uhub.spec +++ b/doc/uhub.spec @@ -41,7 +41,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/etc/sysconfig mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1 -mkdir -p $RPM_BUILD_ROOT/var/lib/uhub +mkdir -p $RPM_BUILD_ROOT/usr/lib/uhub install uhub $RPM_BUILD_ROOT/usr/bin/ install uhub-passwd $RPM_BUILD_ROOT/usr/bin/ @@ -52,7 +52,7 @@ install -m644 doc/init.d.RedHat/etc/sysconfig/uhub $RPM_BUILD_ROOT/etc/sysconfi install -m644 doc/init.d.RedHat/etc/logrotate.d/uhub $RPM_BUILD_ROOT/etc/logrotate.d/ /bin/gzip -9c doc/uhub.1 > doc/uhub.1.gz && install -m644 doc/uhub.1.gz $RPM_BUILD_ROOT/usr/share/man/man1 -install -m644 mod_*.so $RPM_BUILD_ROOT/var/lib/uhub +install -m644 mod_*.so $RPM_BUILD_ROOT/usr/lib/uhub %files