Permalink
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@1004 5dc97367-9…

…7f1-0310-9951-d761b3857238
  • Loading branch information...
1 parent 9ef2b6f commit ae9083efe169e0c908f35b1525264baef325b0da @alobbs alobbs committed Feb 4, 2008
Showing with 32 additions and 38 deletions.
  1. +7 −1 ChangeLog
  2. +0 −15 Makefile.am
  3. +25 −0 cherokee.conf.sample.pre
  4. +0 −22 mods-icons.conf.sample
View
@@ -1,3 +1,9 @@
+2008-02-01 Alvaro Lopez Ortega <alvaro@alobbs.com>
+
+ * cherokee.conf.sample.pre, mods-icons.conf.sample, Makefile.am:
+ Icons definition have been moved to the default configuration
+ file.
+
2008-01-30 Alvaro Lopez Ortega <alvaro@alobbs.com>
* cherokee/main_tweak.c: PRINT_MSG() calls replaced by
@@ -7,7 +13,7 @@
* cherokee/main_admin.c (main): Added win32 initialization. It
also ignores SIGPIPE. Fixes Google#29.
-
+
* cherokee/handler_server_info.c (PAGE_HEADER)
(server_info_build_page): There was a potential problem here. I
have changed a call to a long cherokee_buffer_add_va in which a %s
View
@@ -31,7 +31,6 @@ mods-ssl.sample.pre \
performance.conf.sample.pre
CONFS_DONE = \
-mods-icons.conf.sample \
mime.types.sample \
mime.compression.types.sample
@@ -107,12 +106,6 @@ install-data-local: $(CONFS) $(CONFS_DONE) install-data-local-config
@if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
$(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
fi
- @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/icons ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mods-available/icons"; \
- else \
- $(INSTALL_DATA) $(top_builddir)/mods-icons.conf.sample $(DESTDIR)$(cherokeeconfdir)/mods-available/icons; \
- $(SHELL) -c "cd $(DESTDIR)$(cherokeeconfdir)/mods-enabled/ && $(LN_S) ../mods-available/icons ."; \
- fi
@if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl"; \
else \
@@ -141,14 +134,6 @@ uninstall-local: uninstall-local-config
echo "rm -f $(cherokeeconfdir)/mods-available/ssl"; \
$(RM) -f $(DESTDIR)$(cherokeeconfdir)/mods-available/ssl; \
fi
- @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/icons ; then \
- echo "rm -f $(cherokeeconfdir)/mods-available/icons"; \
- $(RM) -f $(DESTDIR)$(cherokeeconfdir)/mods-available/icons; \
- fi
- @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-enabled/icons ; then \
- echo "rm -f $(cherokeeconfdir)/mods-enabled/icons"; \
- $(RM) -f $(DESTDIR)$(cherokeeconfdir)/mods-enabled/icons; \
- fi
test:
$(MAKE) -C qa test
@@ -58,6 +58,31 @@ vserver!default!extensions!php!handler!balancer!local1!env!PHP_FCGI_CHILDREN = 5
vserver!default!extensions!php!handler!balancer!local1!interpreter = /usr/lib/cgi-bin/php -b 1234
vserver!default!extensions!php!priority = 99999
+# Icons
+#
+icons!directory = folder.png
+icons!parent_directory = back.png
+icons!default = unknown.png
+
+icons!file!bomb.png = core
+icons!file!readme.png = README
+
+icons!suffix!blank.png = html,htm
+icons!suffix!text.png = txt,text,doc,rtf,sdw
+icons!suffix!image.png = jpg,jpeg,jpe,png,gif,xcf,bmp,pcx,tiff,tif,cdr,psd,xpm,xbm
+icons!suffix!sound.png = au,snd,mid,midi,kar,mpga,mpega,mp2,mp3,m3u,sid,wav,aif,aiff,aifc,gsm,m3u,wma,wax,ra,rm,ram,pls,sd2,ogg
+icons!suffix!movie.png = avi,ogg,mpeg,mpga,mpe,mpg,mpeg3,mp2,dl,fli,qt,mov,movie
+icons!suffix!compressed.png = tar,gz,bz2,zip,rar,ace,lha,Z,z,7z
+icons!suffix!binary.png = bin,exe,com,msi,out
+icons!suffix!script.png = sh,csh,ksh,tcl,tk,py,pl,php
+icons!suffix!tex.png = tex,latex,ltx,sty,cls
+icons!suffix!ps.png = ps,eps,ai
+icons!suffix!pdf.png = pdf
+icons!suffix!iso.png = iso,ngr,cue
+icons!suffix!java.png = java,class,jar
+
+
+
include = %sysconfdir%/cherokee/mods-enabled
include = %sysconfdir%/cherokee/sites-enabled
@@ -1,22 +0,0 @@
-# Icons
-#
-icons!directory = folder.png
-icons!parent_directory = back.png
-icons!default = unknown.png
-
-icons!file!bomb.png = core
-icons!file!readme.png = README
-
-icons!suffix!blank.png = html,htm
-icons!suffix!text.png = txt,text,doc,rtf,sdw
-icons!suffix!image.png = jpg,jpeg,jpe,png,gif,xcf,bmp,pcx,tiff,tif,cdr,psd,xpm,xbm
-icons!suffix!sound.png = au,snd,mid,midi,kar,mpga,mpega,mp2,mp3,m3u,sid,wav,aif,aiff,aifc,gsm,m3u,wma,wax,ra,rm,ram,pls,sd2,ogg
-icons!suffix!movie.png = avi,ogg,mpeg,mpga,mpe,mpg,mpeg3,mp2,dl,fli,qt,mov,movie
-icons!suffix!compressed.png = tar,gz,bz2,zip,rar,ace,lha,Z,z,7z
-icons!suffix!binary.png = bin,exe,com,msi,out
-icons!suffix!script.png = sh,csh,ksh,tcl,tk,py,pl,php
-icons!suffix!tex.png = tex,latex,ltx,sty,cls
-icons!suffix!ps.png = ps,eps,ai
-icons!suffix!pdf.png = pdf
-icons!suffix!iso.png = iso,ngr,cue
-icons!suffix!java.png = java,class,jar

0 comments on commit ae9083e

Please sign in to comment.