Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[contrib] rename & edit willie out of contrib #978

Merged
merged 1 commit into from
Jan 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions contrib/README
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
This folder contains willie.service and willie.cfg designed to be distributed by 3rd party distrubtions such as Fedora Project or Arch Linux.
This folder contains sopel.service and sopel.cfg designed to be distributed by 3rd party distrubtions such as Fedora Project or Arch Linux.

willie.cfg is a default configuration file for willie, that assumes the OS is new enough to have /run and /usr/lib/tmpfiles.d
sopel.cfg is a default configuration file for sopel, that assumes the OS is new enough to have /run and /usr/lib/tmpfiles.d

willie.service is a systemd service file that assumes you are using a rather recent Willie and has no multiple instance support (TODO). It also assumes that the system has a special user named willie designated for running the bot and this user has access to /run/willie (should be setup by willie.conf in /usr/lib/tmpfiles.d), /var/log/willie and /var/lib/willie
sopel.service is a systemd service file that assumes you are using a rather recent Willie and has no multiple instance support (TODO). It also assumes that the system has a special user named sopel designated for running the bot and this user has access to /run/sopel (should be setup by sopel.conf in /usr/lib/tmpfiles.d), /var/log/sopel and /var/lib/sopel

Default installation paths:
willie.cfg /etc
willie.conf /usr/lib/tmpfiles.d
willie.service /usr/lib/systemd/system
sopel.cfg /etc
sopel.conf /usr/lib/tmpfiles.d
sopel.service /usr/lib/systemd/system
16 changes: 8 additions & 8 deletions contrib/willie.cfg → contrib/sopel.cfg
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#Default willie configuration file for Fedora
#Default sopel configuration file for Fedora
#For information related to possible configuration values see
# https://github.com/embolalia/willie/wiki/Core-configuration-settings
# https://github.com/embolalia/willie/wiki/Module-Configuration
# https://github.com/sopel-irc/sopel/wiki/Core-configuration-settings
# https://github.com/sopel-irc/sopel/wiki/Module-Configuration
#
#IMPORTANT NOTE!
#You must delete the not_configured line in order for the bot to work,
# otherwise it will refuse to start.
[core]
nick=willie
nick=sopel
not_configured=True
host=chat.freenode.net
port=6697
use_ssl=True
verify_ssl=True
owner=
logdir=/var/log/willie
pid_dir=/run/willie
homedir=/var/lib/willie
logdir=/var/log/sopel
pid_dir=/run/sopel
homedir=/var/lib/sopel

[db]
userdb_type='sqlite'
userdb_file='/var/lib/willie/user.db
userdb_file='/var/lib/sopel/user.db

2 changes: 2 additions & 0 deletions contrib/sopel.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Sopel temporary directory setup
d /run/sopel 0755 sopel sopel -
2 changes: 0 additions & 2 deletions contrib/willie.conf

This file was deleted.