From taru ¡÷ users.sourceforge.jp Fri Feb 4 03:17:35 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Fri, 4 Feb 2005 03:17:35 +0900 Subject: [Ultrapossum-cvs 1204] projects/apache ... Message-ID: <20050203181735.C0D5F2AC04F@users.sourceforge.jp> =================================================================== RCS file: projects/apache/10apache,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- projects/apache/10apache 2005/01/29 10:37:22 1.4 +++ projects/apache/10apache 2005/02/03 18:17:35 1.5 @@ -44,6 +44,8 @@ APACHE_AUTHLDAPIN=$(ultrapossum_getconf APACHE_AUTHLDAPIN "$TEMPLATEDIR/auth_ldap.in") + APACHE2_SSLIN=$(ultrapossum_getconf APACHE2_SSLIN "$TEMPLATEDIR/apache2_ssl.in") + HTTP_PROVIDER=$(ultrapossum_getconf HTTP_PROVIDER "") fi =================================================================== RCS file: projects/apache/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- projects/apache/Makefile.am 2005/01/29 10:37:22 1.3 +++ projects/apache/Makefile.am 2005/02/03 18:17:35 1.4 @@ -9,10 +9,11 @@ update_SCRIPTS = update-apache modulelocal_SCRIPTS = vhosthash -template_DATA = vhost_alias.in auth_ldap.in +template_DATA = vhost_alias.in auth_ldap.in apache2_ssl.in EXTRA_DIST = update-apache \ apache.cf \ 10apache \ - vhost_alias.in + vhost_alias.in \ + apache2_ssl.in =================================================================== RCS file: projects/apache/update-apache,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- projects/apache/update-apache 2005/01/29 10:37:22 1.5 +++ projects/apache/update-apache 2005/02/03 18:17:35 1.6 @@ -21,16 +21,34 @@ eval `ultrapossum-config init` tmp=`tempfile` -trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0 +tmp2=`tempfile` +trap "/bin/rm -f $tmp $tmp2; eval `ultrapossum-config term`" 0 id="APACHE" . $SHAREDIR/plugin configure_debian() { if test "x$APACHE_VHOSTS" != "x"; then - apache-modconf "$1" enable mod_vhost_alias + if test "x$1" = "xapache2"; then + update-apache2-modules --add vhost_aliasa || true + update-apache2-modules --enable vhost_alias + else + apache-modconf "$1" enable mod_vhost_alias + fi + fi + if test "x$s" = "xapache2" && + test -e "$TLSCERTIFICATEFILE" && + test -e "$TLSCERTIFICATEKEYFILE" + then + update-apache2-modules --add ssl || true + update-apache2-modules --enable ssl + fi + if test "x$1" = "xapache2"; then + update-apache2-modules --add auth_ldap || true + update-apache2-modules --enable auth_ldap + else + apache-modconf "$1" enable auth_ldap fi - apache-modconf "$1" enable auth_ldap } remove_debian() { @@ -70,15 +88,33 @@ $SHAREDIR/sedwrap < "$APACHE_AUTHLDAPIN" >> $tmp progress "Configuring auth_ldap... done" fi - add_endmark "##" "$id" >> $tmp + if test -e "$TLSCERTIFICATEFILE" && + test -e "$TLSCERTIFICATEKEYFILE" + then + /bin/cp $tmp $tmp2 + $SHAREDIR/sedwrap < "$APACHE2_SSLIN" >> $tmp2 + add_endmark "##" "$id" >> $tmp + fi + add_endmark "##" "$id" >> $tmp2 for s in $APACHE_SUITES do - progress "Configuring $s..." - add_end_vaconf "$sysconfdir/$s/$APACHE_HTTPDCONF" "$tmp" "$id" - configure_debian "$s" - progress "Configuring $s... done" + if test "x$s" = "xapache2" && + test -e "$TLSCERTIFICATEFILE" && + test -e "$TLSCERTIFICATEKEYFILE" + then + progress "Configuring $s (with SSL)..." + add_end_vaconf "$sysconfdir/$s/$APACHE_HTTPDCONF" "$tmp2" "$id" + configure_debian "$s" > /dev/null + progress "Configuring $s (with SSL)... done" + else + progress "Configuring $s..." + add_end_vaconf "$sysconfdir/$s/$APACHE_HTTPDCONF" "$tmp" "$id" + configure_debian "$s" > /dev/null + progress "Configuring $s... done" + fi done + } From taru ¡÷ users.sourceforge.jp Fri Feb 4 03:17:35 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Fri, 4 Feb 2005 03:17:35 +0900 Subject: [Ultrapossum-cvs 1205] projects/apache/debian 1.1, 1.2, control 1.1, 1.2, rules Message-ID: <20050203181735.DB59C2AC0C7@users.sourceforge.jp> =================================================================== RCS file: projects/apache/debian/control,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/apache/debian/control 2005/01/31 03:43:16 1.1 +++ projects/apache/debian/control 2005/02/03 18:17:35 1.2 @@ -1,12 +1,12 @@ Source: ultrapossum-apache -Section: unknown +Section: net Priority: optional Maintainer: Masato Taruishi Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.6.1 Package: ultrapossum-apache -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} Description: =================================================================== RCS file: projects/apache/debian/rules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/apache/debian/rules 2005/01/31 03:43:16 1.1 +++ projects/apache/debian/rules 2005/02/03 18:17:35 1.2 @@ -68,12 +68,12 @@ $(MAKE) install DESTDIR=$(CURDIR)/debian/ultrapossum-apache -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - # Build architecture-dependent files here. binary-arch: build install +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install dh_testdir dh_testroot dh_installchangelogs From taru ¡÷ users.sourceforge.jp Fri Feb 4 03:42:45 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Fri, 4 Feb 2005 03:42:45 +0900 Subject: [Ultrapossum-cvs 1206] projects/apache ... Message-ID: <20050203184245.9AEA52AC030@users.sourceforge.jp> =================================================================== RCS file: projects/apache/10apache,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- projects/apache/10apache 2005/02/03 18:17:35 1.5 +++ projects/apache/10apache 2005/02/03 18:42:45 1.6 @@ -29,7 +29,9 @@ APACHE_HOSTS=$(ultrapossum_getconf APACHE_HOSTS "$HOST") APACHE_HTTPDCONF=$(ultrapossum_getconf APACHE_HTTPDCONF "httpd.conf") APACHE_DOCUMENTROOT=$(ultrapossum_getconf APACHE_DOCUMENTROOT "`grep ^DocumentRoot $sysconfdir/$(echo $APACHE_SUITES | cut -d' ' -f1)/$APACHE_HTTPDCONF | head -1 | awk -F' ' '{print $2;}'`") - + if test "x$APACHE_DOCUMENTROOT" = "x"; then + APACHE_DOCUMENTROOT="$localstatedir/www" + fi # Virtual host configuration VHOSTSDIR=$(ultrapossum_getconf VHOSTDIR "$localstatedir/lib/$PACKAGE/org") =================================================================== RCS file: projects/apache/apache2_ssl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/apache/apache2_ssl.in 2005/02/03 18:17:35 1.1 +++ projects/apache/apache2_ssl.in 2005/02/03 18:42:45 1.2 @@ -85,6 +85,7 @@ # General setup for the virtual host #DocumentRoot "/usr/share/apache2/default-site/htdocs" +DocumentRoot "#APACHE_DOCUMENTROOT#" ServerName #FQDN#:443 #ServerAdmin you ¡÷ example.com ErrorLog /var/log/apache2/error-ssl.log @@ -163,12 +164,12 @@ # mixture between C and Perl. See the mod_ssl documentation # for more details. # -#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ -# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ -# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ -# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ -# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ -# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ +#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \\ +# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \\ +# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \\ +# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \\ +# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \\ +# or %{REMOTE_ADDR} =~ m/^192\\.76\\.162\\.[0-9]+$/ # # SSL Engine Options: @@ -203,7 +204,7 @@ # This enables optimized SSL connection renegotiation handling when SSL # directives are used in per-directory context. #SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire - + SSLOptions +StdEnvVars @@ -234,15 +235,15 @@ # Similarly, one has to force some clients to use HTTP/1.0 to workaround # their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and # "force-response-1.0" for this. -SetEnvIf User-Agent ".*MSIE.*" \ - nokeepalive ssl-unclean-shutdown \ +SetEnvIf User-Agent ".*MSIE.*" \\ + nokeepalive ssl-unclean-shutdown \\ downgrade-1.0 force-response-1.0 # Per-Server Logging: # The home of a custom SSL log file. Use this when you want a # compact non-error SSL logfile on a virtual host basis. -CustomLog /var/log/apache2/ssl_request_log \ - "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" +CustomLog /var/log/apache2/ssl_request_log \\ + "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \\"%r\\" %b" =================================================================== RCS file: projects/apache/update-apache,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- projects/apache/update-apache 2005/02/03 18:17:35 1.6 +++ projects/apache/update-apache 2005/02/03 18:42:45 1.7 @@ -28,6 +28,17 @@ . $SHAREDIR/plugin configure_debian() { + + if test "x$1" = "xapache" || test "x$1" = "xapache-ssl"; then + if ! test -x "/usr/sbin/apache-modconf"; then + return + fi + else + if ! test -x "/usr/sbin/update-apache2-modules"; then + return + fi + fi + if test "x$APACHE_VHOSTS" != "x"; then if test "x$1" = "xapache2"; then update-apache2-modules --add vhost_aliasa || true From taru ¡÷ users.sourceforge.jp Fri Feb 4 03:42:45 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Fri, 4 Feb 2005 03:42:45 +0900 Subject: [Ultrapossum-cvs 1207] projects/apache/debian 1.2,1.3,control Message-ID: <20050203184245.AA39C2AC0BE@users.sourceforge.jp> =================================================================== RCS file: projects/apache/debian/control,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- projects/apache/debian/control 2005/02/03 18:17:35 1.2 +++ projects/apache/debian/control 2005/02/03 18:42:45 1.3 @@ -7,6 +7,6 @@ Package: ultrapossum-apache Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 | apache | apache-ssl Description: From taru ¡÷ users.sourceforge.jp Fri Feb 4 03:46:08 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Fri, 4 Feb 2005 03:46:08 +0900 Subject: [Ultrapossum-cvs 1208] projects/apache 1.6,1.7,10apache Message-ID: <20050203184608.E00322AC030@users.sourceforge.jp> =================================================================== RCS file: projects/apache/10apache,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- projects/apache/10apache 2005/02/03 18:42:45 1.6 +++ projects/apache/10apache 2005/02/03 18:46:08 1.7 @@ -28,7 +28,7 @@ APACHE_HOSTS=$(ultrapossum_getconf APACHE_HOSTS "$HOST") APACHE_HTTPDCONF=$(ultrapossum_getconf APACHE_HTTPDCONF "httpd.conf") - APACHE_DOCUMENTROOT=$(ultrapossum_getconf APACHE_DOCUMENTROOT "`grep ^DocumentRoot $sysconfdir/$(echo $APACHE_SUITES | cut -d' ' -f1)/$APACHE_HTTPDCONF | head -1 | awk -F' ' '{print $2;}'`") + APACHE_DOCUMENTROOT=$(ultrapossum_getconf APACHE_DOCUMENTROOT "`grep ^DocumentRoot $sysconfdir/$(echo $APACHE_SUITES | cut -d' ' -f1)/$APACHE_HTTPDCONF | head -1 | tr -d \" | awk -F' ' '{print $2;}'`") if test "x$APACHE_DOCUMENTROOT" = "x"; then APACHE_DOCUMENTROOT="$localstatedir/www" fi From taru ¡÷ users.sourceforge.jp Fri Feb 4 03:47:48 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Fri, 4 Feb 2005 03:47:48 +0900 Subject: [Ultrapossum-cvs 1209] projects/apache 1.7,1.8,10apache Message-ID: <20050203184748.934532AC030@users.sourceforge.jp> =================================================================== RCS file: projects/apache/10apache,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- projects/apache/10apache 2005/02/03 18:46:08 1.7 +++ projects/apache/10apache 2005/02/03 18:47:48 1.8 @@ -28,7 +28,7 @@ APACHE_HOSTS=$(ultrapossum_getconf APACHE_HOSTS "$HOST") APACHE_HTTPDCONF=$(ultrapossum_getconf APACHE_HTTPDCONF "httpd.conf") - APACHE_DOCUMENTROOT=$(ultrapossum_getconf APACHE_DOCUMENTROOT "`grep ^DocumentRoot $sysconfdir/$(echo $APACHE_SUITES | cut -d' ' -f1)/$APACHE_HTTPDCONF | head -1 | tr -d \" | awk -F' ' '{print $2;}'`") + APACHE_DOCUMENTROOT=$(ultrapossum_getconf APACHE_DOCUMENTROOT "`grep ^DocumentRoot $sysconfdir/$(echo $APACHE_SUITES | cut -d' ' -f1)/$APACHE_HTTPDCONF | head -1 | tr -d \\\" | awk -F' ' '{print $2;}'`") if test "x$APACHE_DOCUMENTROOT" = "x"; then APACHE_DOCUMENTROOT="$localstatedir/www" fi From taru ¡÷ users.sourceforge.jp Fri Feb 4 17:38:00 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Fri, 4 Feb 2005 17:38:00 +0900 Subject: [Ultrapossum-cvs 1210] ultrapossum/init.d 1.4,1.4.2.1,10edit Message-ID: <20050204083800.9E7EC2AC039@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/init.d/10edit,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- ultrapossum/init.d/10edit 2004/10/31 14:11:07 1.4 +++ ultrapossum/init.d/10edit 2005/02/04 08:38:00 1.4.2.1 @@ -1,11 +1,7 @@ ULTRAPOSSUMMARK=ULTRAPOSSUM$ULTRAPOSSUM_PROJECT backslash() { - ( IFS="\n"; while read line - do - echo -n "$line" | sed 's/\\/\\\\/g' - echo "\\" - done ) + sed 's/\\/\\\\/g' | sed 's/^\(.*\)$/\1\\/' } # replace_vaconf From taru ¡÷ users.sourceforge.jp Sat Feb 5 01:45:01 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Sat, 5 Feb 2005 01:45:01 +0900 Subject: [Ultrapossum-cvs 1211] ultrapossum 1.21,1.21.2.1,update-ultrapossum Message-ID: <20050204164501.19D232AC066@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/update-ultrapossum,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -r1.21 -r1.21.2.1 --- ultrapossum/update-ultrapossum 2004/10/22 16:41:38 1.21 +++ ultrapossum/update-ultrapossum 2005/02/04 16:45:00 1.21.2.1 @@ -66,7 +66,7 @@ do v="ULTRAPOSSUM_MODULE_`echo $module | tr a-z- A-Z_`" if test "x$reconfig" = "x" || test "${!v}" = "installed"; then - $UPDATEDIR/update-$module configure + $UPDATEDIR/update-$module configure < /dev/null fi done } @@ -74,7 +74,7 @@ remove_module() { ultrapossum-config module | while read f do - $UPDATEDIR/update-$f remove + $UPDATEDIR/update-$f remove < /dev/null done } From taru ¡÷ users.sourceforge.jp Mon Feb 7 15:47:05 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 7 Feb 2005 15:47:05 +0900 Subject: [Ultrapossum-cvs 1212] projects/samba ... Message-ID: <20050207064705.23D5A2AC033@users.sourceforge.jp> From taru ¡÷ users.sourceforge.jp Mon Feb 7 15:47:05 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 7 Feb 2005 15:47:05 +0900 Subject: [Ultrapossum-cvs 1213] projects/samba/samba3/LDAP ... Message-ID: <20050207064705.50AAF2AC070@users.sourceforge.jp> From taru ¡÷ users.sourceforge.jp Mon Feb 7 15:48:00 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 7 Feb 2005 15:48:00 +0900 Subject: [Ultrapossum-cvs 1214] projects/samba/debian ... Message-ID: <20050207064800.F04A62AC033@users.sourceforge.jp> From taru ¡÷ users.sourceforge.jp Mon Feb 7 15:49:54 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 7 Feb 2005 15:49:54 +0900 Subject: [Ultrapossum-cvs 1215] projects/at NONE,1.1,run Message-ID: <20050207064954.D54E22AC033@users.sourceforge.jp> From taru ¡÷ users.sourceforge.jp Mon Feb 7 15:49:54 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 7 Feb 2005 15:49:54 +0900 Subject: [Ultrapossum-cvs 1216] projects/at/scripts NONE, 1.1, format NONE, 1.1, restart Message-ID: <20050207064954.EBAEB2AC070@users.sourceforge.jp> From taru ¡÷ users.sourceforge.jp Mon Feb 7 15:51:10 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 7 Feb 2005 15:51:10 +0900 Subject: [Ultrapossum-cvs 1217] projects/samba/debian 1.1,1.2,rules Message-ID: <20050207065110.3C7A92AC033@users.sourceforge.jp> =================================================================== RCS file: projects/samba/debian/rules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/samba/debian/rules 2005/02/07 06:48:00 1.1 +++ projects/samba/debian/rules 2005/02/07 06:51:10 1.2 @@ -81,8 +81,7 @@ # dh_installcron # dh_installinfo dh_installman - dh_link var/lib/ultrapossum/conf.d/smbldap_conf.pm \ - usr/share/ultrapossum/module.d/samba/smbldap_conf.pm + dh_link dh_strip dh_compress dh_fixperms From taru ¡÷ users.sourceforge.jp Tue Feb 8 12:42:33 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Tue, 8 Feb 2005 12:42:33 +0900 Subject: [Ultrapossum-cvs 1218] projects/samba ... Message-ID: <20050208034233.8174D2AC014@users.sourceforge.jp> =================================================================== RCS file: projects/samba/10samba,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/samba/10samba 2005/02/07 06:47:04 1.1 +++ projects/samba/10samba 2005/02/08 03:42:33 1.2 @@ -27,6 +27,8 @@ LDAP_GROUPSUFFIX=$(ultrapossum_getconf LDAP_GROUPSUFFIX "ou=Group") LDAP_MACHINESUFFIX=$(ultrapossum_getconf LDAP_MACHINESUFFIX "ou=Computers") + SAMBA_SID=$(ultrapossum_getconf SAMBA_SID "`net getlocalsid | cut -d' ' -f6`") + SAMBA_DOMAINLOGONS=$(ultrapossum_getconf SAMBA_DOMAINLOGONS "Yes") SAMBA_OSLEVEL=$(ultrapossum_getconf SAMBA_OSLEVEL "65") SAMBA_PREFERREDMASTER=$(ultrapossum_getconf SAMBA_PREFERREDMASTER "Yes") =================================================================== RCS file: projects/samba/samba.cf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/samba/samba.cf 2005/02/07 06:47:04 1.1 +++ projects/samba/samba.cf 2005/02/08 03:42:33 1.2 @@ -17,6 +17,9 @@ ### Samba NT domain Configuration ### +# SID +#SAMBA_SID="`net getlocalsid | cut -d' ' -f6`" + # Domain Logon #SAMBA_DOMAINLOGONS="Yes" =================================================================== RCS file: projects/samba/smbldap.conf.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/samba/smbldap.conf.in 2005/02/07 06:47:04 1.1 +++ projects/samba/smbldap.conf.in 2005/02/08 03:42:33 1.2 @@ -34,7 +34,7 @@ # Put your own SID # to obtain this number do: net getlocalsid -SID="S-1-5-21-1911238739-97561441-2706018148" +SID="#SAMBA_SID#" ############################################################################## # From taru ¡÷ users.sourceforge.jp Tue Feb 8 13:21:21 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Tue, 8 Feb 2005 13:21:21 +0900 Subject: [Ultrapossum-cvs 1219] projects/samba 1.2,1.3,10samba Message-ID: <20050208042121.6FA0E2AC08C@users.sourceforge.jp> =================================================================== RCS file: projects/samba/10samba,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- projects/samba/10samba 2005/02/08 03:42:33 1.2 +++ projects/samba/10samba 2005/02/08 04:21:21 1.3 @@ -27,7 +27,7 @@ LDAP_GROUPSUFFIX=$(ultrapossum_getconf LDAP_GROUPSUFFIX "ou=Group") LDAP_MACHINESUFFIX=$(ultrapossum_getconf LDAP_MACHINESUFFIX "ou=Computers") - SAMBA_SID=$(ultrapossum_getconf SAMBA_SID "`net getlocalsid | cut -d' ' -f6`") + SAMBA_SID=$(ultrapossum_getconf SAMBA_SID "S-1-5-21-1911238739-97561441-2706018148") SAMBA_DOMAINLOGONS=$(ultrapossum_getconf SAMBA_DOMAINLOGONS "Yes") SAMBA_OSLEVEL=$(ultrapossum_getconf SAMBA_OSLEVEL "65") @@ -43,7 +43,7 @@ fi # Parsing configuration file -eval "`ultrapossum_parse_config apache`" +eval "`ultrapossum_parse_config samba`" # Calculating Logical Variables if test "x$ULTRAPOSSUM_MODULE_EXAMPLE" = "xinstalled"; then From taru ¡÷ users.sourceforge.jp Tue Feb 8 13:21:21 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Tue, 8 Feb 2005 13:21:21 +0900 Subject: [Ultrapossum-cvs 1220] projects/samba/debian 1.1,1.2,postinst Message-ID: <20050208042121.8B15C2AC0B3@users.sourceforge.jp> =================================================================== RCS file: projects/samba/debian/postinst,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/samba/debian/postinst 2005/02/07 06:48:00 1.1 +++ projects/samba/debian/postinst 2005/02/08 04:21:21 1.2 @@ -38,6 +38,11 @@ else /etc/init.d/samba restart fi + echo -n "Setting SID... " 1>&2 + sid="`net getlocalsid | cut -d' ' -f6`" + ultrapossum-config set samba SAMBA_SID="$sid" + /usr/share/ultrapossum/update.d/update-samba configure 2> /dev/null + echo "$sid" 1>&2 fi ;; From taru ¡÷ users.sourceforge.jp Tue Feb 8 19:54:24 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Tue, 8 Feb 2005 19:54:24 +0900 Subject: [Ultrapossum-cvs 1221] ultrapossum 1.69.2.2,1.69.2.3,configure.in Message-ID: <20050208105424.516D92AC033@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/configure.in,v retrieving revision 1.69.2.2 retrieving revision 1.69.2.3 diff -u -r1.69.2.2 -r1.69.2.3 --- ultrapossum/configure.in 2005/01/24 11:40:53 1.69.2.2 +++ ultrapossum/configure.in 2005/02/08 10:54:24 1.69.2.3 @@ -4,8 +4,8 @@ # $Id$ AC_PREREQ(2.50) -AC_INIT(ultrapossum, 1.0rc3, taru ¡÷ ultrapossum.org) -AM_INIT_AUTOMAKE(ultrapossum, 1.0rc3) +AC_INIT(ultrapossum, 1.0rc4, taru ¡÷ ultrapossum.org) +AM_INIT_AUTOMAKE(ultrapossum, 1.0rc4) # Checks for directories. SHAREDIR="${datadir}"'/${PACKAGE}' From taru ¡÷ users.sourceforge.jp Tue Feb 8 19:54:24 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Tue, 8 Feb 2005 19:54:24 +0900 Subject: [Ultrapossum-cvs 1222] ultrapossum/debian 1.86.2.6, 1.86.2.7, changelog Message-ID: <20050208105424.6DE672AC0B7@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/debian/changelog,v retrieving revision 1.86.2.6 retrieving revision 1.86.2.7 diff -u -r1.86.2.6 -r1.86.2.7 --- ultrapossum/debian/changelog 2005/01/28 07:58:53 1.86.2.6 +++ ultrapossum/debian/changelog 2005/02/08 10:54:24 1.86.2.7 @@ -1,3 +1,9 @@ +ultrapossum (1.0rc4-1) unstable; urgency=low + + * New upstream release. + + -- Masato Taruishi Tue, 8 Feb 2005 19:51:41 +0900 + ultrapossum (1.0rc3-2) unstable; urgency=medium * Rebuild by pbuilder again. From taru ¡÷ users.sourceforge.jp Tue Feb 8 20:12:54 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Tue, 8 Feb 2005 20:12:54 +0900 Subject: [Ultrapossum-cvs 1223] ultrapossum/debian 1.1, 1.1.2.1, ultrapossum-common.prerm Message-ID: <20050208111254.A618E2AC033@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/debian/ultrapossum-common.prerm,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- ultrapossum/debian/ultrapossum-common.prerm 2004/10/14 17:18:51 1.1 +++ ultrapossum/debian/ultrapossum-common.prerm 2005/02/08 11:12:54 1.1.2.1 @@ -18,11 +18,11 @@ case "$1" in upgrade) - update-alternatives --remove policy-rc.d \ - /usr/share/ultrapossum/policy-rc.d ;; remove|deconfigure|failed-upgrade) # install-info --quiet --remove /usr/info/#PACKAGE#.info.gz + update-alternatives --remove policy-rc.d \ + /usr/share/ultrapossum/policy-rc.d ;; *) echo "prerm called with unknown argument \`$1'" >&2 From taru ¡÷ users.sourceforge.jp Tue Feb 8 21:54:02 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Tue, 8 Feb 2005 21:54:02 +0900 Subject: [Ultrapossum-cvs 1224] projects/samba 1.2,1.3,smbldap.conf.in Message-ID: <20050208125402.2AFF12AC023@users.sourceforge.jp> =================================================================== RCS file: projects/samba/smbldap.conf.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- projects/samba/smbldap.conf.in 2005/02/08 03:42:33 1.2 +++ projects/samba/smbldap.conf.in 2005/02/08 12:54:02 1.3 @@ -156,13 +156,13 @@ # Ex: \\My-PDC-netbios-name\homes\%U # Just set it to a null string if you want to use the smb.conf 'logon home' # directive and/or disable roaming profiles -userSmbHome="\\PDC-SMB3\homes\%U" +userSmbHome="\\#HOST#\homes\%U" # The UNC path to profiles locations (%U username substitution) # Ex: \\My-PDC-netbios-name\profiles\%U # Just set it to a null string if you want to use the smb.conf 'logon path' # directive and/or disable roaming profiles -userProfile="\\PDC-SMB3\profiles\%U" +userProfile="\\#HOST#\profiles\%U" # The default Home Drive Letter mapping # (will be automatically mapped at logon time if home directory exist) From taru ¡÷ users.sourceforge.jp Thu Feb 10 15:59:11 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Thu, 10 Feb 2005 15:59:11 +0900 Subject: [Ultrapossum-cvs 1225] plugin/sasl ... Message-ID: <20050210065911.B9D552AC036@users.sourceforge.jp> =================================================================== RCS file: plugin/sasl/11sasl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin/sasl/11sasl 2005/01/30 18:11:54 1.4 +++ plugin/sasl/11sasl 2005/02/10 06:59:11 1.5 @@ -25,6 +25,12 @@ SASL_MD5_IN=$(ultrapossum_getconf SASL_MD5_IN "$TEMPLATEDIR/sasl-md5.in") APPDNMODE=$(ultrapossum_getconf APPDNMODE "SASL/Digest-MD5") + SASL_GSSAPI_IN=$(ultrapossum_getconf SASL_GSSAPI_IN "$TEMPLATEDIR/sasl-gssapi.in") + KRBCONF=$(ultrapossum_getconf KRBCONF "$sysconfdir/krb5.conf") + if test -f "$KRBCONF"; then + REALM=$(ultrapossum_getconf REALM "`grep -v \# $KRBCONF | grep default_realm | cut -d= -f2 | tr -d ' ' | head -1`") + fi + SASLMODULEDIR=$(ultrapossum_getconf SASLMODULEDIR "/usr/lib/sasl2") fi =================================================================== RCS file: plugin/sasl/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plugin/sasl/Makefile.am 2004/09/29 13:51:19 1.4 +++ plugin/sasl/Makefile.am 2005/02/10 06:59:11 1.5 @@ -8,13 +8,14 @@ modulesysconf_DATA = sasl.cf templatedir = $(sysconfdir)/ultrapossum/in.d -template_DATA = sasl-md5.in +template_DATA = sasl-md5.in sasl-gssapi.in modulelocal_SCRIPTS = sasl-account EXTRA_DIST = \ update-sasl \ sasl-md5.in \ + sasl-gssapi.in \ 11sasl \ sasl-account \ sasl.cf \ =================================================================== RCS file: plugin/sasl/update-sasl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin/sasl/update-sasl 2004/10/11 15:53:42 1.5 +++ plugin/sasl/update-sasl 2005/02/10 06:59:11 1.6 @@ -23,11 +23,12 @@ tmp=`tempfile` trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0 +id="SASL" + configure() { - echo -n "Configuring SASL/Digest-MD5... " 1>&2 + progress "Configuring SASL/Digest-MD5... " + add_startmark "##" $id > $tmp if test -f "$SASL_MD5_IN"; then - id="SASL" - add_startmark "##" $id > $tmp SYNCRDN="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`" ROOT="`echo $ROOTDN | cut -d, -f1 | cut -d= -f2`" sed -e "s/#SUFFIX#/$SUFFIX/" \ @@ -37,10 +38,15 @@ -e "s/#PACKAGE#/$PACKAGE/" \ -e "s/#SYNCDN#/$SYNCDN/" -e "s/#SYNCRDN#/$SYNCRDN/" \ < $SASL_MD5_IN >> $tmp - add_endmark "##" $id >> $tmp - add_vaconf $SLAPDCONF $tmp $id fi - echo "done" 1>&2 + progress "Configuring SASL/Digest-MD5... done" + if test "x$REALM" != "x"; then + progress "Configuring SASL/GSSAPI... " + $SHAREDIR/sedwrap < $SASL_GSSAPI_IN >> $tmp + progress "Configuring SASL/GSSAPI... done" + fi + add_endmark "##" $id >> $tmp + add_vaconf $SLAPDCONF $tmp $id $MODULEDIR/sasl/sasl-account } From taru ¡÷ users.sourceforge.jp Thu Feb 10 15:59:57 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Thu, 10 Feb 2005 15:59:57 +0900 Subject: [Ultrapossum-cvs 1226] plugin/sasl/debian 1.5,1.6,changelog Message-ID: <20050210065957.5146C2AC036@users.sourceforge.jp> =================================================================== RCS file: plugin/sasl/debian/changelog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin/sasl/debian/changelog 2005/01/30 18:13:00 1.5 +++ plugin/sasl/debian/changelog 2005/02/10 06:59:57 1.6 @@ -1,3 +1,9 @@ +ultrapossum-sasl (0.0.1-6) unstable; urgency=low + + * Support SASL/GSSAPI sasl-regexp handling. + + -- Masato Taruishi Thu, 10 Feb 2005 15:57:05 +0900 + ultrapossum-sasl (0.0.1-5) unstable; urgency=low * Added /usr/lib/sasl2 to CHROOTFILES. From taru ¡÷ users.sourceforge.jp Mon Feb 21 13:22:50 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 21 Feb 2005 13:22:50 +0900 Subject: [Ultrapossum-cvs 1227] ultrapossum/module/test/test.d ... Message-ID: <20050221042250.0EDA62AC03F@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/module/test/test.d/00protocol,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- ultrapossum/module/test/test.d/00protocol 2004/10/07 05:59:52 1.4 +++ ultrapossum/module/test/test.d/00protocol 2005/02/21 04:22:49 1.4.2.1 @@ -28,6 +28,18 @@ set -x fi +modify() +{ + ( for i in 1 2 3 4 5 6 7 8 9 10 + do + $1 -x -w $ROOTPW -D $ROOTDN -h $LDAPMASTER -f $TMPFILE && exit 0 + sleep $i + done + exit 1 + ) || exit 1 +} + + ########### Add Test cat >$TMPFILE <$TMPFILE <$TMPFILE <$TMPFILE <$TMPFILE < $TMPFILE +modify ldapmodify +ldapsearch -x -L -b $TESTSUFFIX -h $LDAPMASTER -D "cn=people,$TESTSUFFIX" -w new cn=people userPassword > $TMPFILE sleep 1 -for host in $SLAVES +for host in $LDAPHOSTS do ( for i in 1 2 3 4 5 6 7 8 9 10 do @@ -96,5 +112,7 @@ ############# Protocol Test - -ldapdelete -x -h $HOST -w $ROOTPW -D $ROOTDN "ou=add,$TESTSUFFIX" "cn=people,$TESTSUFFIX" +cat >$TMPFILE < =================================================================== RCS file: ultrapossum/module/failover/10clsfailover,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- ultrapossum/module/failover/10clsfailover 2004/10/11 11:13:57 1.2 +++ ultrapossum/module/failover/10clsfailover 2005/02/21 04:23:10 1.2.2.1 @@ -51,6 +51,6 @@ ) || exit 1 date -$MODULEDIR/server/startup start +$MODULEDIR/server/startup start 2>&1 || true exit $OK =================================================================== RCS file: ultrapossum/module/failover/11recovery,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- ultrapossum/module/failover/11recovery 2004/10/14 09:50:46 1.2 +++ ultrapossum/module/failover/11recovery 2005/02/21 04:23:10 1.2.2.1 @@ -19,7 +19,7 @@ set -e -if test "x$BACKUP" = "x"; then +if test "x$BACKUP" = "x" || ! include "$BACKUP" "$SLURPDSLAVES"; then echo "Ignoring $0 for failover" exit $IGNORE fi @@ -79,7 +79,6 @@ # Failback $MODULEDIR/server/startup start - # Now we check for the slurpd.status file handling From taru ¡÷ users.sourceforge.jp Mon Feb 21 13:50:17 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 21 Feb 2005 13:50:17 +0900 Subject: [Ultrapossum-cvs 1229] ultrapossum 1.69.2.3,1.69.2.4,configure.in Message-ID: <20050221045017.496602AC03F@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/configure.in,v retrieving revision 1.69.2.3 retrieving revision 1.69.2.4 diff -u -r1.69.2.3 -r1.69.2.4 --- ultrapossum/configure.in 2005/02/08 10:54:24 1.69.2.3 +++ ultrapossum/configure.in 2005/02/21 04:50:17 1.69.2.4 @@ -4,8 +4,8 @@ # $Id$ AC_PREREQ(2.50) -AC_INIT(ultrapossum, 1.0rc4, taru ¡÷ ultrapossum.org) -AM_INIT_AUTOMAKE(ultrapossum, 1.0rc4) +AC_INIT(ultrapossum, 1.0rc5, taru ¡÷ ultrapossum.org) +AM_INIT_AUTOMAKE(ultrapossum, 1.0rc5) # Checks for directories. SHAREDIR="${datadir}"'/${PACKAGE}' From taru ¡÷ users.sourceforge.jp Mon Feb 21 13:50:17 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 21 Feb 2005 13:50:17 +0900 Subject: [Ultrapossum-cvs 1230] ultrapossum/debian 1.86.2.7, 1.86.2.8, changelog Message-ID: <20050221045017.6536E2AC069@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/debian/changelog,v retrieving revision 1.86.2.7 retrieving revision 1.86.2.8 diff -u -r1.86.2.7 -r1.86.2.8 --- ultrapossum/debian/changelog 2005/02/08 10:54:24 1.86.2.7 +++ ultrapossum/debian/changelog 2005/02/21 04:50:17 1.86.2.8 @@ -1,3 +1,9 @@ +ultrapossum (1.0rc5-1) unstable; urgency=low + + * New upstream release. + + -- Masato Taruishi Mon, 21 Feb 2005 13:47:20 +0900 + ultrapossum (1.0rc4-1) unstable; urgency=low * New upstream release. From taru ¡÷ users.sourceforge.jp Mon Feb 21 14:17:53 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 21 Feb 2005 14:17:53 +0900 Subject: [Ultrapossum-cvs 1231] ultrapossum/debian 1.15, 1.15.2.1, ultrapossum-failover.config Message-ID: <20050221051753.5078C2AC03F@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/debian/ultrapossum-failover.config,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -r1.15 -r1.15.2.1 --- ultrapossum/debian/ultrapossum-failover.config 2004/10/23 02:52:23 1.15 +++ ultrapossum/debian/ultrapossum-failover.config 2005/02/21 05:17:53 1.15.2.1 @@ -34,6 +34,10 @@ set ultrapossum-failover/backup "$BACKUP" set ultrapossum-failover/virtual "$VIRTUAL" +if test "x$VIRTUAL" != "x"; then + set ultrapossum-failover/virtual_takeover "true" +fi + if test "x$BACKUP" != "x"; then set ultrapossum-failover/do_failover "true" else From taru ¡÷ users.sourceforge.jp Mon Feb 21 14:27:45 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 21 Feb 2005 14:27:45 +0900 Subject: [Ultrapossum-cvs 1232] ultrapossum/module/test 1.3,1.3.2.1,runtest Message-ID: <20050221052745.9BAB12AC03F@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/module/test/runtest,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- ultrapossum/module/test/runtest 2004/10/11 11:13:57 1.3 +++ ultrapossum/module/test/runtest 2005/02/21 05:27:45 1.3.2.1 @@ -29,11 +29,7 @@ export IGNORE=11 test_init() { - if test `$MODULEDIR/server/startup status` != "running"; then - addcmd="$SLAPADD -b $SUFFIX -f $SLAPDMASTERCONF" - else - addcmd="ldapadd -h $LDAPMASTER -x -D $ROOTDN -w $ROOTPW" - fi + addcmd="ldapadd -h $LDAPMASTER -x -D $ROOTDN -w $ROOTPW" echo " dn: $TESTSUFFIX objectClass: top From taru ¡÷ users.sourceforge.jp Mon Feb 21 14:53:15 2005 From: taru ¡÷ users.sourceforge.jp (Masato Taruishi) Date: Mon, 21 Feb 2005 14:53:15 +0900 Subject: [Ultrapossum-cvs 1233] ultrapossum/module/test 1.3.2.1, 1.3.2.2, runtest Message-ID: <20050221055315.9D1C52AC03F@users.sourceforge.jp> =================================================================== RCS file: ultrapossum/module/test/runtest,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- ultrapossum/module/test/runtest 2005/02/21 05:27:45 1.3.2.1 +++ ultrapossum/module/test/runtest 2005/02/21 05:53:15 1.3.2.2 @@ -39,14 +39,7 @@ } test_term() { - if test `$MODULEDIR/server/startup status` != "running"; then - $MODULEDIR/server/startup start - tmpstart=1 - fi ldapdelete -r -h $LDAPMASTER -x -D $ROOTDN -w $ROOTPW $TESTSUFFIX > /dev/null 2> /dev/null - if test "$tmpstart" = "1"; then - $MODULEDIR/server/startup stop - fi } test_term || true