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

Armour v4.0 #139

Merged
merged 58 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
188a43a
New v4.0 beta release
empus Dec 11, 2022
d1d57c0
Update .version
empus Dec 11, 2022
5993761
Update README.md
empus Dec 11, 2022
6c1a5cd
Update .version
empus Dec 11, 2022
1358660
Updated v4.0 beta
empus Dec 11, 2022
ecb2f0d
Merge branch '4_0_beta' of github.com:empus/armour into 4_0_beta
empus Dec 11, 2022
ff29fe6
Update github variable
empus Dec 11, 2022
8e39db2
Remove version specific TCL
empus Dec 11, 2022
cba255d
Update use of token
empus Dec 12, 2022
63c1516
Fix use of token
empus Dec 12, 2022
bfd42b5
Fix use of find on linux
empus Dec 12, 2022
f1c5cfb
Fix file depth check for linux
empus Dec 12, 2022
0b36bc9
Fix github when using branches
empus Dec 12, 2022
8556247
Update github package
empus Dec 12, 2022
7afbe98
Add error handling to github
empus Dec 12, 2022
ac2df8a
Add dict check
empus Dec 12, 2022
4eaf93f
Fix github downloads when using branches
empus Dec 12, 2022
3bce786
Update file move
empus Dec 12, 2022
0d4a614
Allow config file to be named armour.conf
empus Dec 12, 2022
cacaeef
Update db and conf file handling
empus Dec 12, 2022
9d004cd
Remove use of botname var
empus Dec 12, 2022
67fefaf
Escape brackets when processing config
empus Dec 12, 2022
4725bb7
Remove cfg(debug)
empus Dec 12, 2022
7ec8203
Update plugin loader
empus Dec 12, 2022
61a78cb
Move trakka plugin to trakka/
empus Dec 13, 2022
699359c
Floodnet detection fixes
empus Dec 14, 2022
edc214b
Update report
empus Dec 14, 2022
2a26490
user db and command fixes
empus Dec 16, 2022
6ad863c
Update filecount
empus Dec 16, 2022
05ee0fb
Complete config merge process
empus Dec 16, 2022
39b1e8b
Update config file merge
empus Dec 16, 2022
a924131
Fix typo
empus Dec 16, 2022
a0694e3
Remove plugin quote directory
empus Dec 16, 2022
247180d
Update version
empus Dec 16, 2022
82ae7a0
Update scanrbl
empus Dec 16, 2022
c042e91
Fix scanrbls
empus Dec 16, 2022
127805e
Updater improvements
empus Dec 17, 2022
a0d30d2
Update default RBLs
empus Dec 17, 2022
d3f94b1
Improve config merge
empus Dec 17, 2022
a84b4d2
Add quotes in config merge
empus Dec 17, 2022
29399e7
Fixes for autoupdate
empus Dec 17, 2022
4b1716c
Add channel setting: correct
empus Dec 18, 2022
fdf3fa7
Multiple small updates
empus Dec 20, 2022
e131f35
inituser fix to load channels
empus Jan 29, 2023
8017a8f
floodnet handling improvements improvements
empus Feb 16, 2023
1304bc9
Multiple updates
empus Mar 16, 2023
87574b7
new v4.0 build
empus Apr 8, 2023
3c7f9b4
Add 'update info' to show details of latest commit
empus Apr 8, 2023
5d2b17b
Improve 'update' instruction flow
empus Apr 8, 2023
6d41885
Added OpenAI plugin
empus Sep 8, 2023
2fa0c37
Fix openai config setting migration
empus Sep 8, 2023
939c24f
Final openai setting migration fix
empus Sep 8, 2023
fc11fcf
Update revision
empus Sep 8, 2023
a040e5c
New v4.0 revision
empus Mar 1, 2024
3698f69
New v4.0 build
empus Mar 1, 2024
7f06341
New v4.0 build
empus Mar 1, 2024
9fdb60f
Update README
empus Mar 1, 2024
1945f44
Merge branch 'master' into 4_0_beta
empus Mar 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions .version
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version 3.5.1
revision 2020020500
filecount 80
token 3e8SSB4hURVHDWI2zwDIWujU9FiR9gVVFSyLkyTFYt8EbEbtHW6Y2TkkHo1_wyHtHQE5r0T90AC33QCA11
version 4.0
revision 2024030101
comment Update revision summary available @ https://armour.bot/changelog/#2024030100
filecount 112
token QndPhmUgWPWVXARAf6LQNtgev4ZC4uDOR1O6AnC833VI4FrYe94yVSPdaKM_ElsjnoaxzzVC0AC33QCA11
67 changes: 42 additions & 25 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,43 +1,60 @@
# Install Guide
# Armour Setup
Author: Empus [empus@undernet.org](mailto:empus@undernet.org])
Last Updated: 2022-12-06

## **Prerequisites:**
>- \>=TCL 8.6
>- sqlite3
>- TCL packages: sqlite3, tcllib
## Prerequisites
The below are required to run Armour:
* eggdrop 1.8.4 (min)
* sqlite3
* TCL 8.6 (min)
* tcllib


## Eggdrop

### Eggdrop Configuration

## **Eggdrop**
See **bot.conf.sample** for a template for the **eggdrop.conf** itself
This eggdrop configuration doesn't need to be used, but it will get you going fast on a new/dedicated bot for Armour

Once the new bot is online using the bot.conf.sample template, do:
>`/msg <bot> createuser`
Ensure the `./db` directory is created in the eggdrop dir (eggdrop dbs will save here)

Once the new bot is online using the eggdrop sample template template, create your eggdrop account:
>```/msg <bot> createuser```


## Armour

### Armour Configuration

Edit the Armour configuration file as required. Crucially, this will define your default channels and sqlite3 DB path, but there are many more configuration options worth considering.

## **Armour**
Edit the Armour configuration file as required. Crucially, this will define your sqlite3 DB path
Take note to set the md5 method for password security. This will likely be md5sum for Linux machines, or md5 for others.

Now uncomment the last line in the eggdrop file and rehash the bot to load Armour
Note that the Armour TCL itself does not get loaded directly. **Load the Armour \*.conf file** and it will load the TCL for you.
Loading this will create the DB and the necessary tables.
Now uncomment the last line in the eggdrop configuration file and rehash the bot to load Armour.

Note that the Armour TCL itself does not get loaded directly. Load the Armour conf file and it will load the TCL for you and also create the database.


### Armour Setup

Once this is done, you can create your new Armour user which then provisions global and default channel access using the below command. Use <user> to represent the name of your desired bot username, and <account> to represent your network username for autologin, if the network uses user accounts. The below command only works once, when the user database is empty:

>```/msg <bot> inituser <user> [account]```

## **DB Insert**
Once the script is loaded, insert yourself into the sqlite3 db as defined in Armour conf file:
The bot will then generate a random password (sent via /notice) that you can use to login:

>`sqlite3 /path/to/armour-db.db`
>```/msg <bot> login <user> <password>```

>`INSERT INTO users (user,xuser,level,pass) VALUES('YOUR-USER','YOUR-X-ACCOUNT',500,'foo');`
Then a new password can be set:

>`.quit`
>```/msg <bot> newpass <newpassword>```

If autologin is setup and you are authed to X, the bot will soon automatically log you in. If not, cycle the channel.
Once logged into the bot (it will send you a /notice), do:
>`/msg <bot> newpass <pass>`
If the IRC network supports network user accounts (such as Undernet), the bot will now automatically authenticate you when you join channels.

## **Support**
And, you're done!

Questions or problems? Ask in **\#Armour** on Undernet, or post to [GitHub Issues](https://github.com/empus/armour/issues)

- Empus [empus@undernet.org](empus@undernet.org)
### Troubleshooting
Questions or problems? Ask in #Armour on Undernet, or post @ https://github.com/empus/armour/issues

26-01-2022
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
----------------------------------------------------------------------------------------------------------------

![Armour](./armour.png)
Anti abuse and channel management script for eggdrop bots on the Undernet IRC Network

Abuse and channel management script for eggdrop bots on the Undernet IRC Network

https://armour.bot

----------------------------------------------------------------------------------------------------------------

# Warning

This is an out-of-date legacy branch. For the current version of Armour, please us [v4.0 beta](https://github.com/empus/armour/tree/4_0_beta)

# Installation

Detailed install instructions and script documentation is found @ [https://armour.bot](https://armour.bot)
Expand Down
2 changes: 1 addition & 1 deletion UPDATING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
----------------------------------------------------------------------------------------------------------------------------------------
armour.tcl v3.5.1 - 2020.02.05
armour.tcl v4.0.0 - 2022-12-11
----------------------------------------------------------------------------------------------------------------------------------------

![Armour](./armour.png)
Expand Down