Page MenuHomeDevCentral
Files F3767854

No OneTemporary
Actions

View Options

diff --git a/roles/viperserv/eggdrop/files/eggdrop-bot.conf b/roles/viperserv/eggdrop/files/eggdrop-bot.conf
index 9b6cc31..4b84fdf 100755
--- a/roles/viperserv/eggdrop/files/eggdrop-bot.conf
+++ b/roles/viperserv/eggdrop/files/eggdrop-bot.conf
@@ -1,73 +1,73 @@
#!/usr/bin/env eggdrop
# -------------------------------------------------------------
# Eggdrop configuration file
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# License: Trivial work, not eligible to copyright
# Source file: roles/viperserv/eggdrop/files/eggdrop-bot.conf
# Pillar file: pillar/viperserv/bots.sls
# -------------------------------------------------------------
#
# <auto-generated>
# This file is managed by our rOPS SaltStack repository.
#
# Changes to this file may cause incorrect behavior
# and will be lost if the state is redeployed.
# </auto-generated>
#
# _ ___ _____
# | | / (_)___ ___ _____/ ___/___ ______ __
# | | / / / __ \/ _ \/ ___/\__ \/ _ \/ ___/ | / /
# | |/ / / /_/ / __/ / ___/ / __/ / | |/ /
# |___/_/ .___/\___/_/ /____/\___/_/ |___/
# /_/
#
# [ 1993 technology for 2017 hackers ]
#
# -------------------------------------------------------------
# -------------------------------------------------------------
# Settings for {{ botname }}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
set username {{ botname }}
set nick $username
set altnick {{ botname }}`
set realname {{ realname }}
set vhost6 viperserv.nasqueron.org
set listen-addr 2001:470:1f13:9e1:0:c0ff:ee:7
set prefer-ipv6 1
set network freenode
set net-type 5
set servers {
chat.freenode.net:+6697
}
# Main eggdrop settings common to all ViperServ bots
source core.conf
# -------------------------------------------------------------
# MySQL
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-load lib/fbsql/fbsql.so
+load lib/fbsql.so
# -------------------------------------------------------------
# Eggdrop modules
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% for module in modules %}
loadmodule {{ module }}{% endfor %}
# -------------------------------------------------------------
# Scripts
#
# These scripts are provided by the rVIPER distribution.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
source scripts/Core.tcl
source scripts/Tech.tcl
{% for script in scripts %}
source scripts/{{ script }}{% endfor %}
source scripts/vendor/action.fix.tcl
diff --git a/roles/viperserv/eggdrop/software.sls b/roles/viperserv/eggdrop/software.sls
index a1f7e7f..82453f6 100644
--- a/roles/viperserv/eggdrop/software.sls
+++ b/roles/viperserv/eggdrop/software.sls
@@ -1,75 +1,81 @@
# -------------------------------------------------------------
# Salt — Deploy eggdrop park
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-11-05
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs with context %}
# -------------------------------------------------------------
# Build eggdrop
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
eggdrop_software:
file.directory:
- name: /opt/eggdrop
- user: builder
- group: deployment
cmd.run:
- name: install-eggdrop
- runas: builder
- env:
- DEST: /opt/eggdrop
- creates: /opt/eggdrop/eggdrop
{{ dirs.bin }}/eggdrop:
file.symlink:
- target: /opt/eggdrop/eggdrop
- require:
- cmd: eggdrop_software
# -------------------------------------------------------------
# ViperServ directory
#
# Bots specific subdirectories are managed in config.sls
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/srv/viperserv:
file.directory:
- user: viperserv
- group: nasqueron-irc
- dir_mode: 770
viperserv_scripts:
git.latest:
- name: https://devcentral.nasqueron.org/source/viperserv.git
- target: /srv/viperserv/scripts
- update_head: False
- user: viperserv
- require:
- file: /srv/viperserv
{% for eggdir in ['doc', 'help', 'language'] %}
/srv/viperserv/{{ eggdir }}:
file.symlink:
- target: /opt/eggdrop/{{ eggdir }}
- user: viperserv
- group: nasqueron-irc
- require:
- cmd: eggdrop_software
{% endfor %}
+/srv/viperserv/lib:
+ file.directory:
+ - user: viperserv
+ - group: nasqueron-irc
+ - dir_mode: 770
+
/srv/viperserv/logs:
file.directory:
- user: viperserv
- group: nasqueron-irc
- dir_mode: 770
/srv/viperserv/filesys/incoming:
file.directory:
- user: viperserv
- group: nasqueron-irc
- makedirs: True
- dir_mode: 770
diff --git a/roles/viperserv/fbsql/init.sls b/roles/viperserv/fbsql/init.sls
new file mode 100644
index 0000000..74177df
--- /dev/null
+++ b/roles/viperserv/fbsql/init.sls
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------
+# Salt — Deploy eggdrop park
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2017-11-15
+# License: Trivial work, not eligible to copyright
+# Data license: FANTOIR is licensed under Licence Ouverte
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# Build fbsql
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+fbsql_repo:
+ file.directory:
+ - name: /opt/fbsql
+ - user: builder
+ - group: deployment
+ - dir_mode: 755
+ git.latest:
+ - name: https://devcentral.nasqueron.org/source/fbsql.git
+ - target: /opt/fbsql
+ - user: builder
+
+fbsql_build:
+ cmd.run:
+ - name: gmake
+ - runas: builder
+ - cwd: /opt/fbsql
+ - creates: /opt/fbsql/fbsql.so
+
+# -------------------------------------------------------------
+# Install fbsql
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/srv/viperserv/lib/fbsql.so:
+ file.symlink:
+ - target: /opt/fbsql/fbsql.so
+ - user: viperserv
+ - group: nasqueron-irc
diff --git a/roles/viperserv/init.sls b/roles/viperserv/init.sls
index 9cb4254..934686e 100644
--- a/roles/viperserv/init.sls
+++ b/roles/viperserv/init.sls
@@ -1,22 +1,23 @@
# -------------------------------------------------------------
# Salt — Deploy eggdrop park
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-11-05
# License: Trivial work, not eligible to copyright
# _ ___ _____
# | | / (_)___ ___ _____/ ___/___ ______ __
# | | / / / __ \/ _ \/ ___/\__ \/ _ \/ ___/ | / /
# | |/ / / /_/ / __/ / ___/ / __/ / | |/ /
# |___/_/ .___/\___/_/ /____/\___/_/ |___/
# /_/
#
# [ 1993 technology for 2017 hackers ]
#
# -------------------------------------------------------------
include:
- .account
- .eggdrop
+ - .fbsql
- .fantoir
- .wikidata-access-layer

File Metadata

Mime Type
text/x-diff
Expires
Mon, Nov 25, 03:51 (1 d, 4 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2259483
Default Alt Text
(7 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator