[xiph-commits] r18599 - in branches/dir.xiph.org: cronjobs docs inc
dm8tbr at svn.xiph.org
dm8tbr at svn.xiph.org
Tue Sep 11 09:01:24 PDT 2012
Author: dm8tbr
Date: 2012-09-11 09:01:24 -0700 (Tue, 11 Sep 2012)
New Revision: 18599
Modified:
branches/dir.xiph.org/cronjobs/check_servers.sh
branches/dir.xiph.org/docs/apache-vhost.conf
branches/dir.xiph.org/docs/apache2.conf
branches/dir.xiph.org/docs/documentation.txt
branches/dir.xiph.org/docs/my.cnf
branches/dir.xiph.org/inc/inc.templating.php
branches/dir.xiph.org/inc/prepend.php
Log:
Changes to accomodate dir.xiph.org move to debian based xiph server.
Modified: branches/dir.xiph.org/cronjobs/check_servers.sh
===================================================================
--- branches/dir.xiph.org/cronjobs/check_servers.sh 2012-09-11 15:53:00 UTC (rev 18598)
+++ branches/dir.xiph.org/cronjobs/check_servers.sh 2012-09-11 16:01:24 UTC (rev 18599)
@@ -17,7 +17,7 @@
echo "Creating lockfile..."
touch "$LOCKFILE"
echo "Running check_servers.php..."
- /usr/bin/php5 `dirname $0`/check_servers1.php > $LOGFILE 2>&1
+ /usr/bin/php5 `dirname $0`/check_servers.php > $LOGFILE 2>&1
date >> /tmp/${ENVIRONMENT}_list
cat $LOGFILE >> /tmp/${ENVIRONMENT}_list
rm "$LOCKFILE"
Modified: branches/dir.xiph.org/docs/apache-vhost.conf
===================================================================
--- branches/dir.xiph.org/docs/apache-vhost.conf 2012-09-11 15:53:00 UTC (rev 18598)
+++ branches/dir.xiph.org/docs/apache-vhost.conf 2012-09-11 16:01:24 UTC (rev 18599)
@@ -40,6 +40,11 @@
Order deny,allow
Deny from all
</Location>
+ # The same goes for inc
+ <Location "/inc/">
+ Order deny,allow
+ Deny from all
+ </Location>
# Expire header
ExpiresActive On
Modified: branches/dir.xiph.org/docs/apache2.conf
===================================================================
--- branches/dir.xiph.org/docs/apache2.conf 2012-09-11 15:53:00 UTC (rev 18598)
+++ branches/dir.xiph.org/docs/apache2.conf 2012-09-11 16:01:24 UTC (rev 18599)
@@ -24,9 +24,9 @@
# Configuration and logfile names: If the filenames you specify for many
# of the server's control files begin with "/" (or "drive:/" for Win32), the
# server will use that explicit path. If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "/var/log/apache2/foo.log"
-# with ServerRoot set to "" will be interpreted by the
-# server as "//var/log/apache2/foo.log".
+# with "/", the value of ServerRoot is prepended -- so "foo.log"
+# with ServerRoot set to "/etc/apache2" will be interpreted by the
+# server as "/etc/apache2/foo.log".
#
### Section 1: Global Environment
@@ -42,27 +42,24 @@
#
# NOTE! If you intend to place this on an NFS (or otherwise network)
# mounted filesystem then please read the LockFile documentation (available
-# at <URL:http://httpd.apache.org/docs-2.1/mod/mpm_common.html#lockfile>);
+# at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
# you will save yourself a lot of trouble.
#
# Do NOT add a slash at the end of the directory path.
#
-ServerRoot "/etc/apache2"
+#ServerRoot "/etc/apache2"
#
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
#
-#<IfModule !mpm_winnt.c>
-#<IfModule !mpm_netware.c>
-LockFile /var/lock/apache2/accept.lock
-#</IfModule>
-#</IfModule>
+LockFile ${APACHE_LOCK_DIR}/accept.lock
#
# PidFile: The file in which the server should record its process
# identification number when it starts.
+# This needs to be set in /etc/apache2/envvars
#
-PidFile /var/run/apache2.pid
+PidFile ${APACHE_PID_FILE}
#
# Timeout: The number of seconds before receives and sends time out.
@@ -111,19 +108,41 @@
# MaxClients: maximum number of simultaneous client connections
# MinSpareThreads: minimum number of worker threads which are kept spare
# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
+# graceful restart. ThreadLimit can only be changed by stopping
+# and starting Apache.
# ThreadsPerChild: constant number of worker threads in each server process
# MaxRequestsPerChild: maximum number of requests a server process serves
<IfModule mpm_worker_module>
StartServers 2
+ MinSpareThreads 25
+ MaxSpareThreads 75
+ ThreadLimit 64
+ ThreadsPerChild 25
MaxClients 150
+ MaxRequestsPerChild 0
+</IfModule>
+
+# event MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_event_module>
+ StartServers 2
+ MaxClients 150
MinSpareThreads 25
MaxSpareThreads 75
+ ThreadLimit 64
ThreadsPerChild 25
MaxRequestsPerChild 0
</IfModule>
-User www-data
-Group www-data
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
#
# AccessFileName: The name of the file to look for in each directory
@@ -131,7 +150,7 @@
# directive.
#
-#AccessFileName .htaccess
+AccessFileName .htaccess
#
# The following lines prevent .htaccess and .htpasswd files from being
@@ -140,6 +159,7 @@
<Files ~ "^\.ht">
Order allow,deny
Deny from all
+ Satisfy all
</Files>
#
@@ -170,7 +190,7 @@
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
-ErrorLog /var/log/apache2/error.log
+ErrorLog ${APACHE_LOG_DIR}/error.log
#
# LogLevel: Control the number of messages logged to the error_log.
@@ -180,116 +200,31 @@
LogLevel warn
# Include module configuration:
-Include /etc/apache2/mods-enabled/*.load
-Include /etc/apache2/mods-enabled/*.conf
+Include mods-enabled/*.load
+Include mods-enabled/*.conf
# Include all the user configurations:
-Include /etc/apache2/httpd.conf
+Include httpd.conf
# Include ports listing
-Include /etc/apache2/ports.conf
+Include ports.conf
#
# The following directives define some format nicknames for use with
# a CustomLog directive (see below).
+# If you are behind a reverse proxy, you might want to change %h into %{X-Forwarded-For}i
#
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
LogFormat "%{Referer}i -> %U" referer
LogFormat "%{User-agent}i" agent
-#
-# ServerTokens
-# This directive configures what you return as the Server HTTP response
-# Header. The default is 'Full' which sends information about the OS-Type
-# and compiled in modules.
-# Set to one of: Full | OS | Minor | Minimal | Major | Prod
-# where Full conveys the most information, and Prod the least.
-#
-ServerTokens Full
-
-#
-# Optionally add a line containing the server version and virtual host
-# name to server-generated pages (internal error documents, FTP directory
-# listings, mod_status and mod_info output etc., but not CGI generated
-# documents or custom error documents).
-# Set to "EMail" to also include a mailto: link to the ServerAdmin.
-# Set to one of: On | Off | EMail
-#
-ServerSignature On
-
-
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# Putting this all together, we can internationalize error responses.
-#
-# We use Alias to redirect any /error/HTTP_<error>.html.var response to
-# our collection of by-error message multi-language collections. We use
-# includes to substitute the appropriate text.
-#
-# You can modify the messages' appearance without changing any of the
-# default HTTP_<error>.html.var files by adding the line:
-#
-# Alias /error/include/ "/your/include/path/"
-#
-# which allows you to create your own set of files by starting with the
-# /usr/share/apache2/error/include/ files and copying them to /your/include/path/,
-# even on a per-VirtualHost basis. The default include files will display
-# your Apache version number and your ServerAdmin email address regardless
-# of the setting of ServerSignature.
-#
-# The internationalized error documents require mod_alias, mod_include
-# and mod_negotiation. To activate them, uncomment the following 30 lines.
-
-# Alias /error/ "/usr/share/apache2/error/"
-#
-# <Directory "/usr/share/apache2/error">
-# AllowOverride None
-# Options IncludesNoExec
-# AddOutputFilter Includes html
-# AddHandler type-map var
-# Order allow,deny
-# Allow from all
-# LanguagePriority en cs de es fr it nl sv pt-br ro
-# ForceLanguagePriority Prefer Fallback
-# </Directory>
-#
-# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-# ErrorDocument 410 /error/HTTP_GONE.html.var
-# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-
-
-
# Include of directories ignores editors' and dpkg's backup files,
# see README.Debian for details.
# Include generic snippets of statements
-Include /etc/apache2/conf.d/
+Include conf.d/
# Include the virtual host configurations:
-Include /etc/apache2/sites-enabled/
+Include sites-enabled/
Modified: branches/dir.xiph.org/docs/documentation.txt
===================================================================
--- branches/dir.xiph.org/docs/documentation.txt 2012-09-11 15:53:00 UTC (rev 18598)
+++ branches/dir.xiph.org/docs/documentation.txt 2012-09-11 16:01:24 UTC (rev 18599)
@@ -1,3 +1,4 @@
+Icecast YP
dependencies - debian packages (possibly incomplete):
memcached
@@ -32,8 +33,10 @@
chown www-data /var/www/dir.xiph.org/c_templates
vi /var/www/dir.xiph.org/docs/apache-vhost.conf
#add line 4: SetEnv ENVIRONMENT prod
+#replace next two lines with svn external
+cd /var/www/dir.xiph.org/
+svn co http://svn.xiph.org/websites/common/
-
notes:
* if output is blank, make sure c_templates is writeable and you have run the php scripts in cron at least once!
Modified: branches/dir.xiph.org/docs/my.cnf
===================================================================
--- branches/dir.xiph.org/docs/my.cnf 2012-09-11 15:53:00 UTC (rev 18598)
+++ branches/dir.xiph.org/docs/my.cnf 2012-09-11 16:01:24 UTC (rev 18599)
@@ -50,31 +50,31 @@
#
key_buffer = 64M
max_allowed_packet = 2M
-thread_stack = 128K
-thread_cache_size = 10
-max_connections = 100
-table_cache = 64
-max_heap_table_size = 64M
+thread_stack = 192K
+thread_cache_size = 10
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+myisam-recover = BACKUP
+max_connections = 100
+table_cache = 64
+max_heap_table_size = 64M
#thread_concurrency = 10
-#sort_buffer_size = 512K
-#net_buffer_length = 8K
-#read_buffer_size = 256K
-#read_rnd_buffer_size = 512K
-#myisam_sort_buffer_size = 8M
#
# * Query Cache Configuration
#
-query_cache_limit = 0 #1M
+query_cache_limit = 0 #1M
query_cache_size = 0 #16M
-query_cache_type = 0
+query_cache_type = 0
#
# * Logging and Replication
#
# Both location gets rotated by the cronjob.
# Be aware that this log type is a performance killer.
-#log = /var/log/mysql/mysql.log
+# As of 5.1 you can enable the log at runtime!
+#general_log_file = /var/log/mysql/mysql.log
+#general_log = 1
#
-# Error logging goes to syslog. This is a Debian improvement :)
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
#
# Here you can see queries with especially long duration
log_slow_queries = /var/log/mysql/mysql-slow.log
@@ -86,24 +86,18 @@
# other settings you may need to change.
#server-id = 1
#log_bin = /var/log/mysql/mysql-bin.log
-# WARNING: Using expire_logs_days without bin_log crashes the server! See README.Debian!
-#expire_logs_days = 1
-#max_binlog_size = 100M
+expire_logs_days = 10
+max_binlog_size = 100M
#binlog_do_db = include_database_name
#binlog_ignore_db = include_database_name
#
-# * BerkeleyDB
-#
-# Using BerkeleyDB is now discouraged as its support will cease in 5.1.12.
-skip-bdb
-#
# * InnoDB
#
# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
# Read the manual for more InnoDB related options. There are many!
-# You might want to disable InnoDB to shrink the mysqld process by circa 100MB.
-#skip-innodb
+
innodb_flush_log_at_trx_commit = 0
+
#
# * Security Features
#
@@ -130,19 +124,7 @@
key_buffer = 16M
#
-# * NDB Cluster
-#
-# See /usr/share/doc/mysql-server-*/README.Debian for more information.
-#
-# The following configuration is read by the NDB Data Nodes (ndbd processes)
-# not from the NDB Management Nodes (ndb_mgmd processes).
-#
-# [MYSQL_CLUSTER]
-# ndb-connectstring=127.0.0.1
-
-
-#
# * IMPORTANT: Additional settings that can override those from this file!
+# The files must end with '.cnf', otherwise they'll be ignored.
#
!includedir /etc/mysql/conf.d/
-
Modified: branches/dir.xiph.org/inc/inc.templating.php
===================================================================
--- branches/dir.xiph.org/inc/inc.templating.php 2012-09-11 15:53:00 UTC (rev 18598)
+++ branches/dir.xiph.org/inc/inc.templating.php 2012-09-11 16:01:24 UTC (rev 18599)
@@ -1,7 +1,8 @@
<?php
#include_once(dirname(__FILE__).'/template-lite/class.template.php');
-include_once('/usr/share/php/smarty/Smarty.class.php');
+#include_once('/usr/share/php/smarty/Smarty.class.php');
+include_once('/usr/share/php/smarty/libs/Smarty.class.php');
#/usr/share/php/smarty/Smarty_Compiler.class.php
// Templating
Modified: branches/dir.xiph.org/inc/prepend.php
===================================================================
--- branches/dir.xiph.org/inc/prepend.php 2012-09-11 15:53:00 UTC (rev 18598)
+++ branches/dir.xiph.org/inc/prepend.php 2012-09-11 16:01:24 UTC (rev 18599)
@@ -101,4 +101,7 @@
include_once(dirname(__FILE__).'/lib.apilog.php');
include_once(dirname(__FILE__).'/lib.statslog.php');
+// quick hack to get around lack of php-jenkins-hash
+function jenkins_hash_hex($str) { return sha1($str); }
+
?>
More information about the commits
mailing list