From 8a3e9fcb53d3c9e876535e0d262a469ed446f2ff Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 9 Feb 2012 10:14:42 -0200 Subject: Adding custom icons --- files/icons/README.html | 9 +++++ files/icons/back.png | Bin 0 -> 955 bytes files/icons/binary.png | Bin 0 -> 1044 bytes files/icons/blank.png | Bin 0 -> 244 bytes files/icons/bomb.png | Bin 0 -> 1090 bytes files/icons/broken.png | Bin 0 -> 656 bytes files/icons/compressed.png | Bin 0 -> 695 bytes files/icons/deb.png | Bin 0 -> 695 bytes files/icons/dir.png | Bin 0 -> 803 bytes files/icons/down.png | Bin 0 -> 874 bytes files/icons/folder.open.png | Bin 0 -> 803 bytes files/icons/folder.png | Bin 0 -> 803 bytes files/icons/forward.png | Bin 0 -> 930 bytes files/icons/hand.down.png | Bin 0 -> 874 bytes files/icons/hand.left.png | Bin 0 -> 955 bytes files/icons/hand.right.png | Bin 0 -> 930 bytes files/icons/hand.up.png | Bin 0 -> 877 bytes files/icons/html.png | Bin 0 -> 1097 bytes files/icons/image.png | Bin 0 -> 900 bytes files/icons/index.png | Bin 0 -> 1097 bytes files/icons/info.png | Bin 0 -> 1204 bytes files/icons/iso.info.png | Bin 0 -> 1734 bytes files/icons/iso.png | Bin 0 -> 1570 bytes files/icons/jar.png | Bin 0 -> 885 bytes files/icons/left.png | Bin 0 -> 955 bytes files/icons/movie.png | Bin 0 -> 1343 bytes files/icons/odp.png | Bin 0 -> 914 bytes files/icons/ods.png | Bin 0 -> 1011 bytes files/icons/odt.png | Bin 0 -> 654 bytes files/icons/ppt.png | Bin 0 -> 914 bytes files/icons/ps.png | Bin 0 -> 654 bytes files/icons/right.png | Bin 0 -> 930 bytes files/icons/rpm.png | Bin 0 -> 695 bytes files/icons/script.png | Bin 0 -> 885 bytes files/icons/sound.png | Bin 0 -> 776 bytes files/icons/text.png | Bin 0 -> 654 bytes files/icons/txt.png | Bin 0 -> 523 bytes files/icons/unknown.png | Bin 0 -> 656 bytes files/icons/up.png | Bin 0 -> 877 bytes files/icons/world.png | Bin 0 -> 1319 bytes files/icons/xls.png | Bin 0 -> 1011 bytes manifests/init.pp | 35 +++++++++++++++++++ templates/alias.conf.erb | 24 +++++++++++++ templates/apache2.conf.erb | 77 ----------------------------------------- templates/autoindex.conf.erb | 79 +++++++++++++++++++++++++++++++++++++++++++ 45 files changed, 147 insertions(+), 77 deletions(-) create mode 100644 files/icons/README.html create mode 100644 files/icons/back.png create mode 100644 files/icons/binary.png create mode 100644 files/icons/blank.png create mode 100644 files/icons/bomb.png create mode 100644 files/icons/broken.png create mode 100644 files/icons/compressed.png create mode 100644 files/icons/deb.png create mode 100644 files/icons/dir.png create mode 100644 files/icons/down.png create mode 100644 files/icons/folder.open.png create mode 100644 files/icons/folder.png create mode 100644 files/icons/forward.png create mode 100644 files/icons/hand.down.png create mode 100644 files/icons/hand.left.png create mode 100644 files/icons/hand.right.png create mode 100644 files/icons/hand.up.png create mode 100644 files/icons/html.png create mode 100644 files/icons/image.png create mode 100644 files/icons/index.png create mode 100644 files/icons/info.png create mode 100644 files/icons/iso.info.png create mode 100644 files/icons/iso.png create mode 100644 files/icons/jar.png create mode 100644 files/icons/left.png create mode 100644 files/icons/movie.png create mode 100644 files/icons/odp.png create mode 100644 files/icons/ods.png create mode 100644 files/icons/odt.png create mode 100644 files/icons/ppt.png create mode 100644 files/icons/ps.png create mode 100644 files/icons/right.png create mode 100644 files/icons/rpm.png create mode 100644 files/icons/script.png create mode 100644 files/icons/sound.png create mode 100644 files/icons/text.png create mode 100644 files/icons/txt.png create mode 100644 files/icons/unknown.png create mode 100644 files/icons/up.png create mode 100644 files/icons/world.png create mode 100644 files/icons/xls.png create mode 100644 templates/alias.conf.erb create mode 100644 templates/autoindex.conf.erb diff --git a/files/icons/README.html b/files/icons/README.html new file mode 100644 index 0000000..bc2df96 --- /dev/null +++ b/files/icons/README.html @@ -0,0 +1,9 @@ +

Kiddo's Tango icon theme for the Apache server

+

This is a port of the magnificent Tango icon theme to the Apache automatic directory indexing infrastructure. It includes an autoindex.conf file to tell Apache which icons to match to which mimetypes, and various other things to make your directory listings prettier.

+

To set it up

+
    +
  1. download with Bazaar, using bzr get http://code.ecchi.ca/apache-tango-icons
  2. +
  3. check that I do not have bad intentions
  4. +
  5. run ./install.sh
  6. +
+

Icons from the Tango Desktop Project

diff --git a/files/icons/back.png b/files/icons/back.png new file mode 100644 index 0000000..93be3d1 Binary files /dev/null and b/files/icons/back.png differ diff --git a/files/icons/binary.png b/files/icons/binary.png new file mode 100644 index 0000000..2bb2adf Binary files /dev/null and b/files/icons/binary.png differ diff --git a/files/icons/blank.png b/files/icons/blank.png new file mode 100644 index 0000000..34e6c4e Binary files /dev/null and b/files/icons/blank.png differ diff --git a/files/icons/bomb.png b/files/icons/bomb.png new file mode 100644 index 0000000..fbcf936 Binary files /dev/null and b/files/icons/bomb.png differ diff --git a/files/icons/broken.png b/files/icons/broken.png new file mode 100644 index 0000000..e12439a Binary files /dev/null and b/files/icons/broken.png differ diff --git a/files/icons/compressed.png b/files/icons/compressed.png new file mode 100644 index 0000000..dc76287 Binary files /dev/null and b/files/icons/compressed.png differ diff --git a/files/icons/deb.png b/files/icons/deb.png new file mode 100644 index 0000000..dc76287 Binary files /dev/null and b/files/icons/deb.png differ diff --git a/files/icons/dir.png b/files/icons/dir.png new file mode 100644 index 0000000..eaf4be8 Binary files /dev/null and b/files/icons/dir.png differ diff --git a/files/icons/down.png b/files/icons/down.png new file mode 100644 index 0000000..af23788 Binary files /dev/null and b/files/icons/down.png differ diff --git a/files/icons/folder.open.png b/files/icons/folder.open.png new file mode 100644 index 0000000..eaf4be8 Binary files /dev/null and b/files/icons/folder.open.png differ diff --git a/files/icons/folder.png b/files/icons/folder.png new file mode 100644 index 0000000..eaf4be8 Binary files /dev/null and b/files/icons/folder.png differ diff --git a/files/icons/forward.png b/files/icons/forward.png new file mode 100644 index 0000000..6f3f65d Binary files /dev/null and b/files/icons/forward.png differ diff --git a/files/icons/hand.down.png b/files/icons/hand.down.png new file mode 100644 index 0000000..af23788 Binary files /dev/null and b/files/icons/hand.down.png differ diff --git a/files/icons/hand.left.png b/files/icons/hand.left.png new file mode 100644 index 0000000..93be3d1 Binary files /dev/null and b/files/icons/hand.left.png differ diff --git a/files/icons/hand.right.png b/files/icons/hand.right.png new file mode 100644 index 0000000..6f3f65d Binary files /dev/null and b/files/icons/hand.right.png differ diff --git a/files/icons/hand.up.png b/files/icons/hand.up.png new file mode 100644 index 0000000..b0a0cd7 Binary files /dev/null and b/files/icons/hand.up.png differ diff --git a/files/icons/html.png b/files/icons/html.png new file mode 100644 index 0000000..51beaff Binary files /dev/null and b/files/icons/html.png differ diff --git a/files/icons/image.png b/files/icons/image.png new file mode 100644 index 0000000..10f4671 Binary files /dev/null and b/files/icons/image.png differ diff --git a/files/icons/index.png b/files/icons/index.png new file mode 100644 index 0000000..51beaff Binary files /dev/null and b/files/icons/index.png differ diff --git a/files/icons/info.png b/files/icons/info.png new file mode 100644 index 0000000..07cf010 Binary files /dev/null and b/files/icons/info.png differ diff --git a/files/icons/iso.info.png b/files/icons/iso.info.png new file mode 100644 index 0000000..8528ffa Binary files /dev/null and b/files/icons/iso.info.png differ diff --git a/files/icons/iso.png b/files/icons/iso.png new file mode 100644 index 0000000..2a7b970 Binary files /dev/null and b/files/icons/iso.png differ diff --git a/files/icons/jar.png b/files/icons/jar.png new file mode 100644 index 0000000..abf8f61 Binary files /dev/null and b/files/icons/jar.png differ diff --git a/files/icons/left.png b/files/icons/left.png new file mode 100644 index 0000000..93be3d1 Binary files /dev/null and b/files/icons/left.png differ diff --git a/files/icons/movie.png b/files/icons/movie.png new file mode 100644 index 0000000..6e26d9c Binary files /dev/null and b/files/icons/movie.png differ diff --git a/files/icons/odp.png b/files/icons/odp.png new file mode 100644 index 0000000..3633f53 Binary files /dev/null and b/files/icons/odp.png differ diff --git a/files/icons/ods.png b/files/icons/ods.png new file mode 100644 index 0000000..c82d574 Binary files /dev/null and b/files/icons/ods.png differ diff --git a/files/icons/odt.png b/files/icons/odt.png new file mode 100644 index 0000000..c9baeda Binary files /dev/null and b/files/icons/odt.png differ diff --git a/files/icons/ppt.png b/files/icons/ppt.png new file mode 100644 index 0000000..3633f53 Binary files /dev/null and b/files/icons/ppt.png differ diff --git a/files/icons/ps.png b/files/icons/ps.png new file mode 100644 index 0000000..c9baeda Binary files /dev/null and b/files/icons/ps.png differ diff --git a/files/icons/right.png b/files/icons/right.png new file mode 100644 index 0000000..6f3f65d Binary files /dev/null and b/files/icons/right.png differ diff --git a/files/icons/rpm.png b/files/icons/rpm.png new file mode 100644 index 0000000..dc76287 Binary files /dev/null and b/files/icons/rpm.png differ diff --git a/files/icons/script.png b/files/icons/script.png new file mode 100644 index 0000000..abf8f61 Binary files /dev/null and b/files/icons/script.png differ diff --git a/files/icons/sound.png b/files/icons/sound.png new file mode 100644 index 0000000..7aca4aa Binary files /dev/null and b/files/icons/sound.png differ diff --git a/files/icons/text.png b/files/icons/text.png new file mode 100644 index 0000000..c9baeda Binary files /dev/null and b/files/icons/text.png differ diff --git a/files/icons/txt.png b/files/icons/txt.png new file mode 100644 index 0000000..d68a56c Binary files /dev/null and b/files/icons/txt.png differ diff --git a/files/icons/unknown.png b/files/icons/unknown.png new file mode 100644 index 0000000..e12439a Binary files /dev/null and b/files/icons/unknown.png differ diff --git a/files/icons/up.png b/files/icons/up.png new file mode 100644 index 0000000..b0a0cd7 Binary files /dev/null and b/files/icons/up.png differ diff --git a/files/icons/world.png b/files/icons/world.png new file mode 100644 index 0000000..4125479 Binary files /dev/null and b/files/icons/world.png differ diff --git a/files/icons/xls.png b/files/icons/xls.png new file mode 100644 index 0000000..c82d574 Binary files /dev/null and b/files/icons/xls.png differ diff --git a/manifests/init.pp b/manifests/init.pp index 3008b87..9ab4cda 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -117,6 +117,41 @@ class apache { notify => Service["apache"], } + # apache alias configuration + file { "${apache2_mods}-available/alias.conf": + ensure => present, + content => template('apache/alias.conf.erb'), + owner => root, + group => root, + mode => 0644, + notify => Service["apache"], + } + + # apache autoindex configuration + file { "${apache2_mods}-available/autoindex.conf": + ensure => present, + content => template('apache/autoindex.conf.erb'), + owner => root, + group => root, + mode => 0644, + notify => Service["apache"], + } + + # icons folder + file { "${apache_www_folder}/icons": + ensure => directory, + recurse => true, + purge => true, + force => true, + owner => "root", + group => "root", + # This mode will also apply to files from the source directory + mode => 0644, + # Puppet will automatically set +x for directories + source => [ "puppet:///modules/site-apache/htdocs/$domain/icons", + "puppet:///modules/apache/icons", ] + } + # default site configuration file { "${apache2_sites}-available/default": ensure => present, diff --git a/templates/alias.conf.erb b/templates/alias.conf.erb new file mode 100644 index 0000000..342213b --- /dev/null +++ b/templates/alias.conf.erb @@ -0,0 +1,24 @@ + +# +# Aliases: Add here as many aliases as you need (with no limit). The format is +# Alias fakename realname +# +# Note that if you include a trailing / on fakename then the server will +# require it to be present in the URL. So "/icons" isn't aliased in this +# example, only "/icons/". If the fakename is slash-terminated, then the +# realname must also be slash terminated, and if the fakename omits the +# trailing slash, the realname must also omit it. +# +# We include the /icons/ alias for FancyIndexed directory listings. If +# you do not use FancyIndexing, you may comment this out. +# +Alias /icons/ "<%= $apache_www_folder %>" + +"> + Options Indexes MultiViews + AllowOverride None + Order allow,deny + Allow from all + + + diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb index ee28bdc..6bb03a5 100644 --- a/templates/apache2.conf.erb +++ b/templates/apache2.conf.erb @@ -225,83 +225,6 @@ ServerTokens Prod # ServerSignature On -# -# Directives controlling the display of server-generated directory listings. -# - - - # - # IndexOptions: Controls the appearance of server-generated directory - # listings. - # - IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* - - # - # AddIcon* directives tell the server which icon to show for different - # files or filename extensions. These are only displayed for - # FancyIndexed directories. - # - AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip - - AddIconByType (TXT,/icons/text.gif) text/* - AddIconByType (IMG,/icons/image2.gif) image/* - AddIconByType (SND,/icons/sound2.gif) audio/* - AddIconByType (VID,/icons/movie.gif) video/* - - AddIcon /icons/binary.gif .bin .exe - AddIcon /icons/binhex.gif .hqx - AddIcon /icons/tar.gif .tar - AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv - AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip - AddIcon /icons/a.gif .ps .ai .eps - AddIcon /icons/layout.gif .html .shtml .htm .pdf - AddIcon /icons/text.gif .txt - AddIcon /icons/c.gif .c - AddIcon /icons/p.gif .pl .py - AddIcon /icons/f.gif .for - AddIcon /icons/dvi.gif .dvi - AddIcon /icons/uuencoded.gif .uu - AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl - AddIcon /icons/tex.gif .tex - AddIcon /icons/bomb.gif core - - AddIcon /icons/back.gif .. - AddIcon /icons/hand.right.gif README - AddIcon /icons/folder.gif ^^DIRECTORY^^ - AddIcon /icons/blank.gif ^^BLANKICON^^ - - # - # DefaultIcon is which icon to show for files which do not have an icon - # explicitly set. - # - DefaultIcon /icons/unknown.gif - - # - # AddDescription allows you to place a short description after a file in - # server-generated indexes. These are only displayed for FancyIndexed - # directories. - # Format: AddDescription "description" filename - # - #AddDescription "GZIP compressed document" .gz - #AddDescription "tar archive" .tar - #AddDescription "GZIP compressed tar archive" .tgz - - # - # ReadmeName is the name of the README file the server will look for by - # default, and append to directory listings. - # - # HeaderName is the name of a file which should be prepended to - # directory indexes. - ReadmeName README.html - HeaderName HEADER.html - - # - # IndexIgnore is a set of filenames which directory indexing should ignore - # and not include in the listing. Shell-style wildcarding is permitted. - # - IndexIgnore .??* *~ *# RCS CVS *,v *,t - - # diff --git a/templates/autoindex.conf.erb b/templates/autoindex.conf.erb new file mode 100644 index 0000000..9d21242 --- /dev/null +++ b/templates/autoindex.conf.erb @@ -0,0 +1,79 @@ + +# +# Directives controlling the display of server-generated directory listings. +# + +IndexOptions FancyIndexing VersionSort SuppressDescription XHTML HTMLTable FoldersFirst NameWidth=* Charset=UTF-8 + +# AddIcon* directives tell the server which icon to show for different +# files or filename extensions. These are only displayed for +# FancyIndexed directories. +# + +# Custom FileType Icons by Arne Fahrenwalde + +# Pictures +AddIcon /icons/image.png .jpg .jp2 .jif .jpeg .tiff .tif .pict .pct .bmp .gif .png .psd .tga .ai .indd .fh* .fh10 .xcf .svg + +# Application +AddIcon /icons/app.png .app + +# Movies +AddIcon /icons/movie.png .mov .mpg .mpeg .m2v .avi .divx .xvid .swf .wmv .wma .wm* .ram .rm .ogm .ogv + +# Documents +AddIcon /icons/txt.png .txt .text .log +AddIcon /icons/html.png .htm .html .xml .php .shtml .xhtml +AddIcon /icons/odt.png .odt .rtf .doc .ps .pdf +AddIcon /icons/ods.png .ods .xls +AddIcon /icons/odp.png .odp .ppt .pps + +# Compressed Archives +AddIcon /icons/compressed.png .sit .sitx .zip .tar .gtar .gnutar .ustar .gz .tgz .tar-gz .hqx .bin .macbin .as .arc .arj .btoa .bz2 .tbz .tbz2 .cab .z .Z .sea .taz .tar-z .cpt .lza .lha .pf .rar .uu .uue .ync .y + +# Sound Files +AddIcon /icons/sound.png .mp3 .m4a .mp4 .m4* .wav .aif .aiff .ogg .oga .spx .flac + +# Disk Images & PKGs +AddIcon /icons/iso.png .dmg .iso .smi .img .toast +AddIcon /icons/deb.png .pkg .deb +AddIcon /icons/rpm.png .rpm + +# Add-On + +AddIcon /icons/h.png .h +AddIcon /icons/jar.png .jar +AddIcon /icons/log.png .log +AddIcon /icons/script.png .scpt .command .term .sh + +# iWork +AddIcon /icons/pages.png .pages +AddIcon /icons/keynote.png .key + +# standard-types +AddIcon /icons/bomb.png core + +AddIcon /icons/back.png .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.png ^^DIRECTORY^^ +AddIcon /icons/blank.png ^^BLANKICON^^ + +# other Types +AddIconByEncoding (CMP,/icons/compressed.png) x-compress x-gzip +AddIconByType (TXT,/icons/text.png) text/* +AddIconByType (IMG,/icons/image.png) image/* +AddIconByType (SND,/icons/sound.png) audio/* +AddIconByType (VID,/icons/movie.png) video/* + +# +# DefaultIcon is which icon to show for files which do not have an icon +# explicitly set. +# +DefaultIcon /icons/unknown.png + +# +# IndexIgnore is a set of filenames which directory indexing should ignore +# and not include in the listing. Shell-style wildcarding is permitted. +# +IndexIgnore .??* *~ *# RCS CVS *,v *,t + -- cgit v1.2.3