updates to services

2020-12-02 01:49:12 -05:00 · 2020-12-02 01:49:12 -05:00 · 2c7c2db340
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-*#
+*#*~
--- a/config/anope/botserv.conf
+++ b/config/anope/botserv.conf
@ -18,9 +18,9 @@ module
 	client              = "BotServ"
 	defaults            = "greet fantasy"
 	minusers            = 1
-	#smartjoin          = yes
+	smartjoin           = yes
 	botmodes            = "ao"
-	#botumodes          = "i"
+	botumodes           = "i"
 }

 command {
@ -260,7 +260,6 @@ privilege
 module
 {
 	name                = "fantasy"
-	#fantasycharacter   = "!."
 }

 command {
--- a/config/anope/memoserv.conf
+++ b/config/anope/memoserv.conf
@ -98,21 +98,6 @@ command {
  command    = "memoserv/read";
 }

-/*
-module {
-	name       = "ms_rsend";
-	operonly   = false;
-}
-*/
-
-/*
-command {
-  service    = "MemoServ";
-  name       = "RSEND";
-  command    = "memoserv/rsend";
-}
-*/
-
 module {
  name       = "ms_send";
 }
--- a/config/anope/nickserv.conf
+++ b/config/anope/nickserv.conf
@ -14,8 +14,8 @@ module
 	client               = "NickServ"
 	forceemail           = no
 	confirmemailchanges  = no
-	unregistered_notice  = "Register your nick /msg NickServ REGISTER password email"
-	defaults             = "ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
+	unregistered_notice  = "Use /msg NICKSERV REGISTER to claim your nickname"
+	defaults             = "ns_private hide_email hide_mask memo_signon memo_receive autoop ns_keep_modes ns_no_expire"
 	regdelay             = 30s
 	expire               = 4y
 	secureadmins         = yes
@ -24,8 +24,8 @@ module
 	hidenetsplitquit     = no
 	killquick            = 20s
 	kill                 = 60s
-	restrictopernicks    = yes
-	enforceruser         = "enforcer"
+	restrictopernicks    = no
+	enforceruser         = "3nf0rc3r"
 	enforcerhost         = "services.host"
 	releasetimeout       = 1m
 	guestnickprefix      = "`"
--- a/config/anope/operserv.conf
+++ b/config/anope/operserv.conf
@ -1,3 +1,7 @@
+/*
+ * example configuration at https://github.com/anope/anope/blob/2.0/data/example.conf                                                                          
+ */
+
 service
 {

@ -9,7 +13,6 @@ service
 	channels                = "@#services"
 }

-
 module
 {
 	name                    = "operserv"
@ -26,7 +29,6 @@ module
 	opersonly               = yes
 }

-
 command {
  service                 = "OperServ";
  name                    = "HELP";
@ -56,69 +58,6 @@ command {
  permission              = "operserv/chankill";
 }

-/*
-module
-{
-	name                    = "os_defcon"
-	defaultlevel            = 5
-	level4                  = "nonewchannels nonewnicks nomlockchanges reducedsessions"
-	level3                  = "nonewchannels nonewnicks nomlockchanges forcechanmodes reducedsessions"
-	level2                  = "nonewchannels nonewnicks nomlockchanges forcechanmodes reducedsessions silentoperonly"
-	level1                  = "nonewchannels nonewnicks nomlockchanges forcechanmodes reducedsessions silentoperonly akillnewclients"
-	sessionlimit            = 2
-	akillexpire             = 5m
-	chanmodes               = "+R"
-	timeout                 = 15m
-	globalondefcon          = yes
-	globalondefconmore      = yes
-	message                 = "Put your message to send your users here. Don't forget to uncomment globalondefconmore"
-	offmessage              = "Services are now back to normal, sorry for any inconvenience"
-	akillreason             = "This network is currently not accepting connections, please try again later."
-}
-*/
-
-/*
-command {
-  service                 = "OperServ";
-  name                    = "DEFCON";
-  command                 = "operserv/defcon";
-  permission              = "operserv/defcon";
-}
-*/
-
-/*
-module
-{
-	name                    = "os_dns"
-	ttl                     = 1m
-	user_drop_mark          = 50
-	user_drop_time          = 1m
-	user_drop_readd_time    = 5m
-	remove_split_servers    = yes
-	readd_connected_servers = no
-}
-*/
-
-/*
-command {
-  service                 = "OperServ";
-  name                    = "DNS";
-  command                 = "operserv/dns";
-  permission              = "operserv/dns";
-}
-*/
-
-module {
-  name                    = "os_config";
-}
-
-command {
-  service                 = "OperServ";
-  name                    = "CONFIG";
-  command                 = "operserv/config";
-  permission              = "operserv/config";
-}
-
 module {
  name                    = "os_forbid";
 }
@ -219,20 +158,6 @@ command {
  command                 = "operserv/logout";
 }

-module
-{
-	name                    = "os_logsearch"
-	logname                 = "services.log"
-}
-
-command {
-  service                 = "OperServ";
-  name                    = "LOGSEARCH";
-  command                 = "operserv/logsearch";
-  permission              = "operserv/logsearch";
-}
-
-
 module {
  name                    = "os_mode";
 }
@ -269,37 +194,11 @@ command {
  permission              = "operserv/modinfo";
 }

-module {
-  name                    = "os_module";
-}
-
-command {
-  service                 = "OperServ";
-  name                    = "MODLOAD";
-  command                 = "operserv/modload";
-  permission              = "operserv/modload";
-}
-
-command {
-  service                 = "OperServ";
-  name                    = "MODRELOAD";
-  command                 = "operserv/modreload";
-  permission              = "operserv/modload";
-}
-
-command {
-  service                 = "OperServ";
-  name                    = "MODUNLOAD";
-  command                 = "operserv/modunload";
-  permission              = "operserv/modload";
-}
-
 module
 {
 	name                    = "os_news"
 	announcer               = "Global"
 	oper_announcer          = "OperServ"
-	#newscount              = 3
 }

 command {
@ -323,32 +222,16 @@ command {
  permission              = "operserv/news";
 }

-
-module {
-  name                    = "os_noop";
-}
-
-command {
-  service                 = "OperServ";
-  name                    = "NOOP";
-  command                 = "operserv/noop";
-  permission              = "operserv/noop";
-}
-
-/*
 module {
  name                    = "os_oline";
 }
-*/

-/*
 command {
  service                 = "OperServ";
  name                    = "OLINE";
  command                 = "operserv/oline";
  permission              = "operserv/oline";
 }
-*/

 module {
  name                    = "os_oper";
@ -377,9 +260,7 @@ module
 	name                    = "os_session"
 	defaultsessionlimit     = 3
 	maxsessionlimit         = 100
-	#exceptionexpiry        = 1d
 	sessionlimitexceeded    = "The session limit for your IP %IP% has been exceeded."
-	#sessionlimitdetailsloc = "Please visit https://your.website.url/ for more information about session limits."
 	maxsessionkill          = 15
 	sessionautokillexpiry   = 30m
 	session_ipv4_cidr       = 32
@ -403,7 +284,6 @@ command {
 module
 {
 	name                    = "os_set"
-	#superadmin             = yes
 }

 command {
@ -417,20 +297,6 @@ module {
  name                    = "os_shutdown"
 }

-command {
-  service                 = "OperServ";
-  name                    = "QUIT";
-  command                 = "operserv/quit";
-  permission              = "operserv/quit";
-}
-
-command {
-  service                 = "OperServ";
-  name                    = "RESTART";
-  command                 = "operserv/restart";
-  permission              = "operserv/restart";
-}
-
 command {
  service                 = "OperServ";
  name                    = "SHUTDOWN";
--- a/config/anope/services.conf
+++ b/config/anope/services.conf
@ -60,12 +60,9 @@ options
 	readtimeout               = 5s;
 	warningtimeout            = 4h;
 	timeoutcheck              = 3s;
-  #hidestatso               = yes;
-  #ulineservers             = "stats.your.network";
 	retrywait                 = 60s;
 	hideprivilegedcommands    = yes;
 	hideregisteredcommands    = yes
-  #regexengine              = "regex/pcre";
  languages                 = "de_DE.UTF-8 el_GR.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 hu_HU.UTF-8 it_IT.UTF-8 nl_NL.UTF-8 pt_PT.UTF-8";
 }

--- a/config/hybrid/.#tor-dmz.classes.conf
+++ b/config/hybrid/.#tor-dmz.classes.conf
@ -1 +0,0 @@
-toor@linux-u55l.26602:1606810927
--- a/doc/.gitignore
+++ b/doc/.gitignore
@ -1 +0,0 @@
-*~
--- a/hb_bounce/.gitignore
+++ b/hb_bounce/.gitignore
@ -1 +0,0 @@
-znc.conf
--- a/hb_hopm/docker-compose.yml
+++ b/hb_hopm/docker-compose.yml
@ -0,0 +1,41 @@
+# 100.64.48.24/30 100.64.66.96/27
+
+version: "3.8"
+
+networks:
+  default:
+    ipam:
+      driver: default
+      config:
+        - subnet: 100.64.48.24/30
+
+services:
+  hopm:
+    restart: unless-stopped
+    hostname: h0pm.n3tw3rk.1ns3cur1ty.c0rp
+    build:
+      context: ../hopm
+      dockerfile: Dockerfile
+    image: hopm:latest
+    command: "/usr/local/hopm/bin/hopm"
+    environment:
+      LANG: en_US.utf8
+      TZ: UTC
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 1024000
+        hard: 1024000
+    networks:
+      default:
+        ipv4_address: 100.64.48.26
+    volumes:
+      - type: volume
+        source: ephemeral
+        target: /usr/local/hopm/var
+        volume:
+          nocopy: false
+      - ../config/hopm:/usr/local/hopm/etc:ro
+
+volumes:
+  ephemeral:
--- a/hopm/Dockerfile
+++ b/hopm/Dockerfile
@ -0,0 +1,17 @@
+FROM debian:latest
+RUN apt-get update && apt-get -y install git subversion libssl-dev build-essential autoconf automake1.11 clang zlib1g-dev libsqlite3-dev
+RUN mkdir -p /tmp/hopm
+WORKDIR /tmp/hopm
+RUN git clone https://github.com/ircd-hybrid/hopm.git
+WORKDIR /tmp/hopm/hopm
+RUN ./configure --prefix=/usr/local/hopm
+RUN make
+RUN make install
+WORKDIR /usr/local/hopm
+RUN rm -rf /tmp/hopm
+RUN apt -y remove git subversion libssl-dev build-essential autoconf automake1.11 clang zlib1g-dev libsqlite3-dev
+RUN groupadd -g 2000 ircd
+RUN useradd -m -u 2001 -g ircd ircd
+RUN mkdir -p /usr/local/ircd/logs
+RUN chown -R 2001:2000 /usr/local/ircd
+USER ircd
--- a/hybrid/Dockerfile
+++ b/hybrid/Dockerfile
@ -1,6 +1,6 @@
 FROM debian:latest
 RUN apt-get update && apt-get -y install git subversion libssl-dev build-essential autoconf automake1.11 clang zlib1g-dev libsqlite3-dev
-RUN mkdir -p /tmp/hybrd
+RUN mkdir -p /tmp/hybrid
 WORKDIR /tmp/hybrid
 RUN git clone https://github.com/ircd-hybrid/ircd-hybrid.git 
 WORKDIR /tmp/hybrid/ircd-hybrid