diff options
| -rw-r--r-- | .github/workflows/ci-alpine.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci-linux.yml | 2 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | data/modules.example.conf | 10 | ||||
| -rw-r--r-- | modules/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | modules/ldap_authentication.cpp (renamed from modules/extra/ldap_authentication.cpp) | 0 | ||||
| -rw-r--r-- | modules/ldap_oper.cpp (renamed from modules/extra/ldap_oper.cpp) | 0 | ||||
| -rw-r--r-- | modules/sql_authentication.cpp (renamed from modules/extra/sql_authentication.cpp) | 0 | ||||
| -rw-r--r-- | modules/sql_log.cpp (renamed from modules/extra/sql_log.cpp) | 0 | ||||
| -rw-r--r-- | modules/sql_oper.cpp (renamed from modules/extra/sql_oper.cpp) | 0 |
10 files changed, 7 insertions, 18 deletions
diff --git a/.github/workflows/ci-alpine.yml b/.github/workflows/ci-alpine.yml index b289efee1..a910e45ec 100644 --- a/.github/workflows/ci-alpine.yml +++ b/.github/workflows/ci-alpine.yml @@ -36,7 +36,7 @@ jobs: - name: Enable extras run: | - for MODULE in ldap ldap_authentication ldap_oper mysql regex_pcre2 regex_posix regex_tre sql_authentication sql_log sql_oper sqlite ssl_gnutls ssl_openssl + for MODULE in ldap mysql regex_pcre2 regex_posix regex_tre sqlite ssl_gnutls ssl_openssl do ln -s $PWD/modules/extra/$MODULE.cpp $PWD/modules done diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index c6340a632..3782e921c 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -31,7 +31,7 @@ jobs: - name: Enable extras run: | - for MODULE in ldap ldap_authentication ldap_oper mysql regex_pcre2 regex_posix regex_tre sql_authentication sql_log sql_oper sqlite ssl_gnutls ssl_openssl + for MODULE in ldap mysql regex_pcre2 regex_posix regex_tre sqlite ssl_gnutls ssl_openssl do ln -s ${{ github.workspace }}/modules/extra/$MODULE.cpp ${{ github.workspace }}/modules done diff --git a/.gitignore b/.gitignore index 1495a75a6..a2f8a7bbb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,15 +2,10 @@ build/ config.cache include/sysconf.h modules/ldap.cpp -modules/ldap_authentication.cpp -modules/ldap_oper.cpp modules/mysql.cpp modules/regex_pcre2.cpp modules/regex_posix.cpp modules/regex_tre.cpp -modules/sql_authentication.cpp -modules/sql_log.cpp -modules/sql_oper.cpp modules/sqlite.cpp modules/ssl_gnutls.cpp modules/ssl_openssl.cpp diff --git a/data/modules.example.conf b/data/modules.example.conf index 0520a8934..4089e9ea2 100644 --- a/data/modules.example.conf +++ b/data/modules.example.conf @@ -254,7 +254,7 @@ module { name = "help" } } /* - * ldap_authentication [EXTRA] + * ldap_authentication * * This module allows many commands such as IDENTIFY, RELEASE, RECOVER, GHOST, etc. use * LDAP to authenticate users. Requires ldap. @@ -314,7 +314,7 @@ module { name = "help" } } /* - * ldap_oper [EXTRA] + * ldap_oper * * This module dynamically ties users to Anope opertypes when they identify * via LDAP group membership. Requires ldap. @@ -640,7 +640,7 @@ module { name = "sasl" } } /* - * sql_authentication [EXTRA] + * sql_authentication * * This module allows authenticating users against an external SQL database using a custom * query. @@ -691,7 +691,7 @@ module { name = "sasl" } } /* - * sql_log [EXTRA] + * sql_log * * This module adds an additional target option to log{} blocks * that allows logging Service's logs to SQL. To log to SQL, add @@ -711,7 +711,7 @@ module { name = "sasl" } #module { name = "sql_log" } /* - * sql_oper [EXTRA] + * sql_oper * * This module allows granting users services operator privileges and possibly IRC Operator * privileges based on an external SQL database using a custom query. diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 7e1298f53..8485886e2 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -25,12 +25,6 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../conanbuildinfo.cmake") enable_extra("ssl_openssl" "OPENSSL") # this uses Wldap so should always be available copy_extra("ldap") - # these don't actually have extra dependencies, but require a module which does - copy_extra("sql_authentication") - copy_extra("sql_log") - copy_extra("sql_oper") - copy_extra("ldap_authentication") - copy_extra("ldap_oper") # Package extra dlls file(GLOB EXTRA_DLLS "${Anope_SOURCE_DIR}/extradll/bin/*.dll" "${Anope_SOURCE_DIR}/extradll/lib/*.dll") diff --git a/modules/extra/ldap_authentication.cpp b/modules/ldap_authentication.cpp index 4f4f4f1fc..4f4f4f1fc 100644 --- a/modules/extra/ldap_authentication.cpp +++ b/modules/ldap_authentication.cpp diff --git a/modules/extra/ldap_oper.cpp b/modules/ldap_oper.cpp index 62749f957..62749f957 100644 --- a/modules/extra/ldap_oper.cpp +++ b/modules/ldap_oper.cpp diff --git a/modules/extra/sql_authentication.cpp b/modules/sql_authentication.cpp index 54307496c..54307496c 100644 --- a/modules/extra/sql_authentication.cpp +++ b/modules/sql_authentication.cpp diff --git a/modules/extra/sql_log.cpp b/modules/sql_log.cpp index 7335a5abf..7335a5abf 100644 --- a/modules/extra/sql_log.cpp +++ b/modules/sql_log.cpp diff --git a/modules/extra/sql_oper.cpp b/modules/sql_oper.cpp index af2b40346..af2b40346 100644 --- a/modules/extra/sql_oper.cpp +++ b/modules/sql_oper.cpp |