diff --git a/.gitattributes b/.gitattributes index 0a656265..f76a3e87 100644 --- a/.gitattributes +++ b/.gitattributes @@ -268,8 +268,6 @@ etc/alternc/apache.conf -text etc/alternc/menulist.txt -text etc/alternc/phpmyadmin.inc.php -text etc/alternc/templates/alternc/bureau.conf -text -etc/alternc/templates/apache-ssl/httpd.conf -text -etc/alternc/templates/apache/httpd.conf -text etc/alternc/templates/bind/automatic.conf -text etc/alternc/templates/bind/named.conf -text etc/alternc/templates/bind/slaveip.conf -text diff --git a/etc/alternc/templates/apache-ssl/httpd.conf b/etc/alternc/templates/apache-ssl/httpd.conf deleted file mode 100644 index 9f166f0a..00000000 --- a/etc/alternc/templates/apache-ssl/httpd.conf +++ /dev/null @@ -1,263 +0,0 @@ -# -# Fichier de configuration principale d'Apache-SSL pour AlternC -# $Id: httpd.conf,v 1.12 2006/01/19 21:12:49 anarcat Exp $ -# -# %%warning_message%% -# - -## -## httpd.conf -- Apache HTTP server configuration file -## - -ServerType standalone -ServerTokens Prod -ServerRoot /etc/apache-ssl -LockFile /var/lock/apache-ssl.lock -PidFile /var/run/apache-ssl.pid -ScoreBoardFile /var/run/apache-ssl.scoreboard - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 500 -KeepAliveTimeout 15 -MinSpareServers 3 -MaxSpareServers 10 -StartServers 3 -MaxClients 150 - -MaxRequestsPerChild 1000000 -Listen 443 -BindAddress * - -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# have to place corresponding `LoadModule' lines at this location so the -# directives contained in it are actually available _before_ they are used. -# Please read the file README.DSO in the Apache 1.3 distribution for more -# details about the DSO mechanism and run `apache -l' for the list of already -# built-in (statically linked and thus always available) modules in your apache -# binary. -# -# Please keep this LoadModule: line here, it is needed for installation. -LoadModule vhost_alias_module /usr/lib/apache/1.3/mod_vhost_alias.so -# LoadModule env_module /usr/lib/apache/1.3/mod_env.so -LoadModule config_log_module /usr/lib/apache/1.3/mod_log_config_ssl.so -# LoadModule mime_magic_module /usr/lib/apache/1.3/mod_mime_magic.so -LoadModule mime_module /usr/lib/apache/1.3/mod_mime_ssl.so -LoadModule negotiation_module /usr/lib/apache/1.3/mod_negotiation.so -LoadModule status_module /usr/lib/apache/1.3/mod_status.so -# LoadModule info_module /usr/lib/apache/1.3/mod_info.so -# LoadModule includes_module /usr/lib/apache/1.3/mod_include.so -LoadModule autoindex_module /usr/lib/apache/1.3/mod_autoindex.so -LoadModule dir_module /usr/lib/apache/1.3/mod_dir.so -LoadModule cgi_module /usr/lib/apache/1.3/mod_cgi.so -# LoadModule asis_module /usr/lib/apache/1.3/mod_asis.so -# LoadModule imap_module /usr/lib/apache/1.3/mod_imap.so -# LoadModule action_module /usr/lib/apache/1.3/mod_actions.so -# LoadModule speling_module /usr/lib/apache/1.3/mod_speling.so -# LoadModule userdir_module /usr/lib/apache/1.3/mod_userdir.so -LoadModule alias_module /usr/lib/apache/1.3/mod_alias.so -LoadModule rewrite_module /usr/lib/apache/1.3/mod_rewrite.so -LoadModule access_module /usr/lib/apache/1.3/mod_access.so -LoadModule apache_ssl_module /usr/lib/apache/1.3/libssl.so -LoadModule auth_module /usr/lib/apache/1.3/mod_auth_ssl.so -# LoadModule anon_auth_module /usr/lib/apache/1.3/mod_auth_anon.so -# LoadModule dbm_auth_module /usr/lib/apache/1.3/mod_auth_dbm.so -# LoadModule db_auth_module /usr/lib/apache/1.3/mod_auth_db.so -# LoadModule proxy_module /usr/lib/apache/1.3/libproxy.so -# LoadModule digest_module /usr/lib/apache/1.3/mod_digest.so -# LoadModule cern_meta_module /usr/lib/apache/1.3/mod_cern_meta.so -LoadModule expires_module /usr/lib/apache/1.3/mod_expires.so -# LoadModule headers_module /usr/lib/apache/1.3/mod_headers.so -# LoadModule usertrack_module /usr/lib/apache/1.3/mod_usertrack.so -LoadModule unique_id_module /usr/lib/apache/1.3/mod_unique_id.so -LoadModule setenvif_module /usr/lib/apache/1.3/mod_setenvif.so -# LoadModule sys_auth_module /usr/lib/apache/1.3/mod_auth_sys.so -# LoadModule put_module /usr/lib/apache/1.3/mod_put.so -# LoadModule throttle_module /usr/lib/apache/1.3/mod_throttle.so -# LoadModule allowdev_module /usr/lib/apache/1.3/mod_allowdev.so -#LoadModule auth_mysql_module /usr/lib/apache/1.3/mod_auth_mysql.so -# LoadModule eaccess_module /usr/lib/apache/1.3/mod_eaccess.so -# LoadModule fastcgi_module /usr/lib/apache/1.3/mod_fastcgi.so -LoadModule php4_module /usr/lib/apache/1.3/libphp4.so -# LoadModule roaming_module /usr/lib/apache/1.3/mod_roaming.so -LoadModule gzip_module /usr/lib/apache/1.3/mod_gzip.so - -ExtendedStatus On -User www-data -Group www-data -ServerAdmin root@%%fqdn%% -ServerName %%fqdn%% -DocumentRoot /var/alternc/bureau - - - Options SymLinksIfOwnerMatch - AllowOverride None - - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - - -UseCanonicalName On -TypesConfig /etc/mime.types -DefaultType text/plain - - - MIMEMagicFile share/magic - - -HostnameLookups Off -ErrorLog /var/log/apache-ssl/error.log -LogLevel debug - -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" full -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %P %T" debug -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -CustomLog /var/log/apache-ssl/access.log full - -ServerSignature Off - - - Options Indexes MultiViews - AllowOverride None - Order allow,deny - Allow from all - - -ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ - - - Options FollowSymLinks IncludesNOEXEC ExecCGI - AllowOverride None - Order allow,deny - Allow from all - AddHandler cgi-script .cgi - - - - IndexOptions FancyIndexing NameWidth=* - 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 /icons/unknown.gif - ReadmeName README - HeaderName HEADER - IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t - - - - AddEncoding x-compress Z - AddEncoding x-gzip gz tgz - AddLanguage da .dk - AddLanguage nl .nl - AddLanguage en .en - AddLanguage et .ee - AddLanguage fr .fr - AddLanguage de .de - AddLanguage el .el - AddLanguage it .it - AddLanguage ja .ja - AddCharset ISO-2022-JP .jis - AddLanguage pl .po - AddCharset ISO-8859-2 .iso-pl - AddLanguage pt .pt - AddLanguage pt-br .pt-br - AddLanguage ltz .lu - AddLanguage ca .ca - AddLanguage es .es - AddLanguage sv .se - AddLanguage cz .cz - - - LanguagePriority en fr da nl et de el it ja pl pt pt-br ltz ca es sv - - - AddType application/x-httpd-php .php .php3 .php4 .phtml - AddType application/x-httpd-php-source .phps - - AddType application/x-tar .tgz - AddType image/bmp .bmp - AddType text/x-hdml .hdml - - - -AddDefaultCharset off - - - BrowserMatch "Mozilla/2" nokeepalive - BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 - BrowserMatch "RealPlayer 4\.0" force-response-1.0 - BrowserMatch "Java/1\.0" force-response-1.0 - BrowserMatch "JDK/1\.0" force-response-1.0 - - - - Alias /perl/ /var/www/perl/ - - SetHandler perl-script - PerlHandler Apache::Registry - Options +ExecCGI - - - - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from %%monitor_ip%% - - -DirectoryIndex index.html index.htm index.shtml index.php3 index.php4 index.phtml index.php - -SSLCacheServerPath /usr/lib/apache-ssl/gcache - -SSLCacheServerPort /var/run/gcache_port -SSLSessionCacheTimeout 15 -SSLCACertificatePath /etc/apache-ssl -SSLCertificateFile /etc/apache-ssl/apache.pem -SSLVerifyClient 0 -SSLVerifyDepth 10 -SSLFakeBasicAuth -CustomLog /var/log/apache-ssl/ssl.log "%t %{version}c %{cipher}c %{clientcert}c" -SSLDisable - -DirectoryIndex index.html index.htm index.shtml index.php3 index.php4 index.phtml index.php - -Include /etc/apache-ssl/conf.d/[^.#]* diff --git a/etc/alternc/templates/apache/httpd.conf b/etc/alternc/templates/apache/httpd.conf deleted file mode 100644 index 5760d49b..00000000 --- a/etc/alternc/templates/apache/httpd.conf +++ /dev/null @@ -1,250 +0,0 @@ -# -# Fichier de configuration principale d'Apache pour AlternC -# $Id: httpd.conf,v 1.15 2005/12/10 16:39:16 anarcat Exp $ -# -# %%warning_message%% - -## -## httpd.conf -- Apache HTTP server configuration file -## - -ServerType standalone -ServerTokens Prod -ServerRoot /etc/apache -LockFile /var/lock/apache.lock -PidFile /var/run/apache.pid -ScoreBoardFile /var/run/apache.scoreboard - -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 500 -KeepAliveTimeout 15 -MinSpareServers 5 -MaxSpareServers 10 -StartServers 5 -MaxClients 150 - -MaxRequestsPerChild 1000000 -Listen 80 -BindAddress * - -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# have to place corresponding `LoadModule' lines at this location so the -# directives contained in it are actually available _before_ they are used. -# Please read the file README.DSO in the Apache 1.3 distribution for more -# details about the DSO mechanism and run `apache -l' for the list of already -# built-in (statically linked and thus always available) modules in your apache -# binary. -# -# Please keep this LoadModule: line here, it is needed for installation. -LoadModule vhost_alias_module /usr/lib/apache/1.3/mod_vhost_alias.so -LoadModule config_log_module /usr/lib/apache/1.3/mod_log_config.so -LoadModule mime_module /usr/lib/apache/1.3/mod_mime.so -LoadModule negotiation_module /usr/lib/apache/1.3/mod_negotiation.so -LoadModule status_module /usr/lib/apache/1.3/mod_status.so -LoadModule autoindex_module /usr/lib/apache/1.3/mod_autoindex.so -LoadModule dir_module /usr/lib/apache/1.3/mod_dir.so -LoadModule cgi_module /usr/lib/apache/1.3/mod_cgi.so -LoadModule alias_module /usr/lib/apache/1.3/mod_alias.so -LoadModule access_module /usr/lib/apache/1.3/mod_access.so -LoadModule auth_module /usr/lib/apache/1.3/mod_auth_ssl.so -LoadModule expires_module /usr/lib/apache/1.3/mod_expires.so -LoadModule unique_id_module /usr/lib/apache/1.3/mod_unique_id.so -LoadModule setenvif_module /usr/lib/apache/1.3/mod_setenvif.so -# LoadModule fastcgi_module /usr/lib/apache/1.3/mod_fastcgi.so -LoadModule php4_module /usr/lib/apache/1.3/libphp4.so -# LoadModule env_module /usr/lib/apache/1.3/mod_env.so -# LoadModule mime_magic_module /usr/lib/apache/1.3/mod_mime_magic.so -# LoadModule info_module /usr/lib/apache/1.3/mod_info.so -# LoadModule includes_module /usr/lib/apache/1.3/mod_include.so -# LoadModule asis_module /usr/lib/apache/1.3/mod_asis.so -# LoadModule imap_module /usr/lib/apache/1.3/mod_imap.so -# LoadModule action_module /usr/lib/apache/1.3/mod_actions.so -# LoadModule speling_module /usr/lib/apache/1.3/mod_speling.so -# LoadModule userdir_module /usr/lib/apache/1.3/mod_userdir.so -LoadModule rewrite_module /usr/lib/apache/1.3/mod_rewrite.so -# LoadModule anon_auth_module /usr/lib/apache/1.3/mod_auth_anon.so -# LoadModule dbm_auth_module /usr/lib/apache/1.3/mod_auth_dbm.so -# LoadModule db_auth_module /usr/lib/apache/1.3/mod_auth_db.so -# LoadModule proxy_module /usr/lib/apache/1.3/libproxy.so -# LoadModule digest_module /usr/lib/apache/1.3/mod_digest.so -# LoadModule cern_meta_module /usr/lib/apache/1.3/mod_cern_meta.so -# LoadModule headers_module /usr/lib/apache/1.3/mod_headers.so -# LoadModule usertrack_module /usr/lib/apache/1.3/mod_usertrack.so -# LoadModule sys_auth_module /usr/lib/apache/1.3/mod_auth_sys.so -# LoadModule put_module /usr/lib/apache/1.3/mod_put.so -# LoadModule throttle_module /usr/lib/apache/1.3/mod_throttle.so -# LoadModule allowdev_module /usr/lib/apache/1.3/mod_allowdev.so -# LoadModule auth_mysql_module /usr/lib/apache/1.3/mod_auth_mysql.so -# LoadModule eaccess_module /usr/lib/apache/1.3/mod_eaccess.so -# LoadModule roaming_module /usr/lib/apache/1.3/mod_roaming.so -LoadModule gzip_module /usr/lib/apache/1.3/mod_gzip.so - -ExtendedStatus On -User www-data -Group www-data -ServerAdmin root@%%fqdn%% -ServerName %%fqdn%% -DocumentRoot /var/alternc/bureau - - - Options SymLinksIfOwnerMatch - AllowOverride None - - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - - -UseCanonicalName On -TypesConfig /etc/mime.types -DefaultType text/plain - - - MIMEMagicFile share/magic - - -HostnameLookups Off -ErrorLog /var/log/apache/error.log -LogLevel debug - -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" full -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %P %T" debug -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -CustomLog /var/log/apache/access.log full - -ServerSignature Off - -Alias /icons/ /usr/share/apache/icons/ - - - Options Indexes MultiViews - AllowOverride None - Order allow,deny - Allow from all - - -ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/ - - - Options FollowSymLinks IncludesNOEXEC ExecCGI - AllowOverride None - Order allow,deny - Allow from all - AddHandler cgi-script .cgi - - - - IndexOptions FancyIndexing NameWidth=* - 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 /icons/unknown.gif - ReadmeName README - HeaderName HEADER - IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t - - - - AddEncoding x-compress Z - AddEncoding x-gzip gz tgz - AddLanguage da .dk - AddLanguage nl .nl - AddLanguage en .en - AddLanguage et .ee - AddLanguage fr .fr - AddLanguage de .de - AddLanguage el .el - AddLanguage it .it - AddLanguage ja .ja - AddCharset ISO-2022-JP .jis - AddLanguage pl .po - AddCharset ISO-8859-2 .iso-pl - AddLanguage pt .pt - AddLanguage pt-br .pt-br - AddLanguage ltz .lu - AddLanguage ca .ca - AddLanguage es .es - AddLanguage sv .se - AddLanguage cz .cz - - - LanguagePriority en fr da nl et de el it ja pl pt pt-br ltz ca es sv - - - AddType application/x-httpd-php .php .php3 .php4 .phtml - AddType application/x-httpd-php-source .phps - - AddType application/x-tar .tgz - AddType image/bmp .bmp - AddType text/x-hdml .hdml - - - -AddDefaultCharset off - - - - BrowserMatch "Mozilla/2" nokeepalive - BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 - - BrowserMatch "RealPlayer 4\.0" force-response-1.0 - BrowserMatch "Java/1\.0" force-response-1.0 - BrowserMatch "JDK/1\.0" force-response-1.0 - - - - Alias /perl/ /var/www/perl/ - - SetHandler perl-script - PerlHandler Apache::Registry - Options +ExecCGI - - - - - SetHandler server-status - Order deny,allow - Deny from all - Allow from %%monitor_ip%% - - -DirectoryIndex index.html index.htm index.shtml index.php3 index.php4 index.phtml index.php - -Include /etc/apache/conf.d/[^.#]* diff --git a/install/alternc.install b/install/alternc.install index e51b3b43..08d067ec 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -18,15 +18,9 @@ TEMPLATE_DIR="/etc/alternc/templates" # replace this one unconditionnally CONFIG_FILES="etc/alternc/bureau.conf" -if [ -e /etc/apache/httpd.conf ]; then - CONFIG_FILES="$CONFIG_FILES etc/apache/httpd.conf" -fi if [ -e /etc/php4/apache/php.ini ]; then CONFIG_FILES="$CONFIG_FILES etc/php4/apache/php.ini" fi -if [ -e /etc/apache-ssl/httpd.conf ]; then - CONFIG_FILES="$CONFIG_FILES etc/apache-ssl/httpd.conf" -fi if [ -e /etc/php4/cgi/php.ini ]; then CONFIG_FILES="$CONFIG_FILES etc/php4/cgi/php.ini" fi