From: Alan T. DeKok Date: Wed, 11 Jan 2012 12:27:55 +0000 (+0100) Subject: Moved modules/* to mods-available/* X-Git-Tag: release_3_0_0_beta0~416 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9b024c364d09aca5c422da7990c6e0690214ba5;p=thirdparty%2Ffreeradius-server.git Moved modules/* to mods-available/* This should help solve issues related to various files being in modules/ when they're not supposed to be there --- diff --git a/raddb/Makefile b/raddb/Makefile index d1669720b63..8ae81fa7b85 100644 --- a/raddb/Makefile +++ b/raddb/Makefile @@ -51,7 +51,7 @@ mods-enabled: @cd mods-enabled/; \ for x in $(DEFAULT_MODULES); do \ if [ ! -f $$x ]; then \ - ln -s ../modules/$$x; \ + ln -s ../mods-available/$$x; \ fi; \ done @@ -59,9 +59,10 @@ install: $(INSTALL) -d -m 750 $(R)$(raddbdir) $(INSTALL) -d -m 750 $(R)$(raddbdir)/sites-available $(INSTALL) -d -m 750 $(R)$(raddbdir)/sites-enabled - $(INSTALL) -d -m 750 $(R)$(raddbdir)/modules + $(INSTALL) -d -m 750 $(R)$(raddbdir)/mods-available + $(INSTALL) -d -m 750 $(R)$(raddbdir)/mods-enabled @echo "Creating/updating files in $(R)$(raddbdir)"; \ - for i in $(FILES) `find sites-available/ modules/ -type f -print | sed 's/.*CVS.*//;s/.*~//;s/.*#.*//' `; do \ + for i in $(FILES) `find sites-available/ mods-available/ -type f -print | sed 's/.*~//;s/.*#.*//' `; do \ [ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 640 $$i $(R)$(raddbdir)/$$i; \ if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \ echo "** $(R)$(raddbdir)/$$i"; \ @@ -106,6 +107,12 @@ install: ln -s ../sites-available/$$x; \ fi; \ done + @cd $(R)$(raddbdir)/mods-enabled/; \ + for x in $(DEFAULT_MODULES); do \ + if [ ! -f $$x ]; then \ + ln -s ../mods-available/$$x; \ + fi; \ + done clean: @rm -rf *~ $(addprefix sites-enabled/,$(DEFAULT_SITES)) \ diff --git a/raddb/modules/acct_unique b/raddb/mods-available/acct_unique similarity index 100% rename from raddb/modules/acct_unique rename to raddb/mods-available/acct_unique diff --git a/raddb/modules/always b/raddb/mods-available/always similarity index 100% rename from raddb/modules/always rename to raddb/mods-available/always diff --git a/raddb/modules/attr_filter b/raddb/mods-available/attr_filter similarity index 100% rename from raddb/modules/attr_filter rename to raddb/mods-available/attr_filter diff --git a/raddb/modules/attr_rewrite b/raddb/mods-available/attr_rewrite similarity index 100% rename from raddb/modules/attr_rewrite rename to raddb/mods-available/attr_rewrite diff --git a/raddb/modules/chap b/raddb/mods-available/chap similarity index 100% rename from raddb/modules/chap rename to raddb/mods-available/chap diff --git a/raddb/modules/checkval b/raddb/mods-available/checkval similarity index 100% rename from raddb/modules/checkval rename to raddb/mods-available/checkval diff --git a/raddb/modules/counter b/raddb/mods-available/counter similarity index 100% rename from raddb/modules/counter rename to raddb/mods-available/counter diff --git a/raddb/modules/cui b/raddb/mods-available/cui similarity index 100% rename from raddb/modules/cui rename to raddb/mods-available/cui diff --git a/raddb/modules/detail b/raddb/mods-available/detail similarity index 100% rename from raddb/modules/detail rename to raddb/mods-available/detail diff --git a/raddb/modules/detail.example.com b/raddb/mods-available/detail.example.com similarity index 100% rename from raddb/modules/detail.example.com rename to raddb/mods-available/detail.example.com diff --git a/raddb/modules/detail.log b/raddb/mods-available/detail.log similarity index 100% rename from raddb/modules/detail.log rename to raddb/mods-available/detail.log diff --git a/raddb/modules/digest b/raddb/mods-available/digest similarity index 100% rename from raddb/modules/digest rename to raddb/mods-available/digest diff --git a/raddb/modules/dynamic_clients b/raddb/mods-available/dynamic_clients similarity index 100% rename from raddb/modules/dynamic_clients rename to raddb/mods-available/dynamic_clients diff --git a/raddb/modules/eap b/raddb/mods-available/eap similarity index 100% rename from raddb/modules/eap rename to raddb/mods-available/eap diff --git a/raddb/modules/echo b/raddb/mods-available/echo similarity index 100% rename from raddb/modules/echo rename to raddb/mods-available/echo diff --git a/raddb/modules/etc_group b/raddb/mods-available/etc_group similarity index 100% rename from raddb/modules/etc_group rename to raddb/mods-available/etc_group diff --git a/raddb/modules/exec b/raddb/mods-available/exec similarity index 100% rename from raddb/modules/exec rename to raddb/mods-available/exec diff --git a/raddb/modules/expiration b/raddb/mods-available/expiration similarity index 100% rename from raddb/modules/expiration rename to raddb/mods-available/expiration diff --git a/raddb/modules/expr b/raddb/mods-available/expr similarity index 100% rename from raddb/modules/expr rename to raddb/mods-available/expr diff --git a/raddb/modules/files b/raddb/mods-available/files similarity index 100% rename from raddb/modules/files rename to raddb/mods-available/files diff --git a/raddb/modules/inner-eap b/raddb/mods-available/inner-eap similarity index 100% rename from raddb/modules/inner-eap rename to raddb/mods-available/inner-eap diff --git a/raddb/modules/ippool b/raddb/mods-available/ippool similarity index 100% rename from raddb/modules/ippool rename to raddb/mods-available/ippool diff --git a/raddb/modules/krb5 b/raddb/mods-available/krb5 similarity index 100% rename from raddb/modules/krb5 rename to raddb/mods-available/krb5 diff --git a/raddb/modules/ldap b/raddb/mods-available/ldap similarity index 100% rename from raddb/modules/ldap rename to raddb/mods-available/ldap diff --git a/raddb/modules/linelog b/raddb/mods-available/linelog similarity index 100% rename from raddb/modules/linelog rename to raddb/mods-available/linelog diff --git a/raddb/modules/logintime b/raddb/mods-available/logintime similarity index 100% rename from raddb/modules/logintime rename to raddb/mods-available/logintime diff --git a/raddb/modules/mac2ip b/raddb/mods-available/mac2ip similarity index 100% rename from raddb/modules/mac2ip rename to raddb/mods-available/mac2ip diff --git a/raddb/modules/mac2vlan b/raddb/mods-available/mac2vlan similarity index 100% rename from raddb/modules/mac2vlan rename to raddb/mods-available/mac2vlan diff --git a/raddb/modules/mschap b/raddb/mods-available/mschap similarity index 100% rename from raddb/modules/mschap rename to raddb/mods-available/mschap diff --git a/raddb/modules/ntlm_auth b/raddb/mods-available/ntlm_auth similarity index 100% rename from raddb/modules/ntlm_auth rename to raddb/mods-available/ntlm_auth diff --git a/raddb/modules/opendirectory b/raddb/mods-available/opendirectory similarity index 100% rename from raddb/modules/opendirectory rename to raddb/mods-available/opendirectory diff --git a/raddb/modules/otp b/raddb/mods-available/otp similarity index 100% rename from raddb/modules/otp rename to raddb/mods-available/otp diff --git a/raddb/modules/pam b/raddb/mods-available/pam similarity index 100% rename from raddb/modules/pam rename to raddb/mods-available/pam diff --git a/raddb/modules/pap b/raddb/mods-available/pap similarity index 100% rename from raddb/modules/pap rename to raddb/mods-available/pap diff --git a/raddb/modules/passwd b/raddb/mods-available/passwd similarity index 100% rename from raddb/modules/passwd rename to raddb/mods-available/passwd diff --git a/raddb/modules/perl b/raddb/mods-available/perl similarity index 100% rename from raddb/modules/perl rename to raddb/mods-available/perl diff --git a/raddb/modules/policy b/raddb/mods-available/policy similarity index 100% rename from raddb/modules/policy rename to raddb/mods-available/policy diff --git a/raddb/modules/preprocess b/raddb/mods-available/preprocess similarity index 100% rename from raddb/modules/preprocess rename to raddb/mods-available/preprocess diff --git a/raddb/modules/radutmp b/raddb/mods-available/radutmp similarity index 100% rename from raddb/modules/radutmp rename to raddb/mods-available/radutmp diff --git a/raddb/modules/realm b/raddb/mods-available/realm similarity index 100% rename from raddb/modules/realm rename to raddb/mods-available/realm diff --git a/raddb/modules/redis b/raddb/mods-available/redis similarity index 100% rename from raddb/modules/redis rename to raddb/mods-available/redis diff --git a/raddb/modules/rediswho b/raddb/mods-available/rediswho similarity index 100% rename from raddb/modules/rediswho rename to raddb/mods-available/rediswho diff --git a/raddb/modules/replicate b/raddb/mods-available/replicate similarity index 100% rename from raddb/modules/replicate rename to raddb/mods-available/replicate diff --git a/raddb/modules/smbpasswd b/raddb/mods-available/smbpasswd similarity index 100% rename from raddb/modules/smbpasswd rename to raddb/mods-available/smbpasswd diff --git a/raddb/modules/smsotp b/raddb/mods-available/smsotp similarity index 100% rename from raddb/modules/smsotp rename to raddb/mods-available/smsotp diff --git a/raddb/modules/soh b/raddb/mods-available/soh similarity index 100% rename from raddb/modules/soh rename to raddb/mods-available/soh diff --git a/raddb/modules/sql b/raddb/mods-available/sql similarity index 100% rename from raddb/modules/sql rename to raddb/mods-available/sql diff --git a/raddb/modules/sql_log b/raddb/mods-available/sql_log similarity index 100% rename from raddb/modules/sql_log rename to raddb/mods-available/sql_log diff --git a/raddb/modules/sqlcounter_expire_on_login b/raddb/mods-available/sqlcounter_expire_on_login similarity index 100% rename from raddb/modules/sqlcounter_expire_on_login rename to raddb/mods-available/sqlcounter_expire_on_login diff --git a/raddb/modules/sqlippool b/raddb/mods-available/sqlippool similarity index 100% rename from raddb/modules/sqlippool rename to raddb/mods-available/sqlippool diff --git a/raddb/modules/sradutmp b/raddb/mods-available/sradutmp similarity index 100% rename from raddb/modules/sradutmp rename to raddb/mods-available/sradutmp diff --git a/raddb/modules/unix b/raddb/mods-available/unix similarity index 100% rename from raddb/modules/unix rename to raddb/mods-available/unix diff --git a/raddb/modules/utf8 b/raddb/mods-available/utf8 similarity index 100% rename from raddb/modules/utf8 rename to raddb/mods-available/utf8 diff --git a/raddb/modules/wimax b/raddb/mods-available/wimax similarity index 100% rename from raddb/modules/wimax rename to raddb/mods-available/wimax diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in index edb50c984a8..be2d2f675d3 100644 --- a/raddb/radiusd.conf.in +++ b/raddb/radiusd.conf.in @@ -680,13 +680,13 @@ modules { # # - # As of 2.0.5, most of the module configurations are in a - # sub-directory. Files matching the regex /[a-zA-Z0-9_.]+/ - # are loaded. The modules are initialized ONLY if they are - # referenced in a processing section, such as authorize, - # authenticate, accounting, pre/post-proxy, etc. + # As of 3.0, modules are in mods-enabled/. Files matching + # the regex /[a-zA-Z0-9_.]+/ are loaded. The modules are + # initialized ONLY if they are referenced in a processing + # section, such as authorize, authenticate, accounting, + # pre/post-proxy, etc. # - $INCLUDE ${confdir}/modules/ + $INCLUDE ${confdir}/mods-enabled/ } # Instantiation