Skip to content

Instantly share code, notes, and snippets.

@omega8cc

omega8cc/wtf.diff.txt

Created July 20, 2010 02:43
Show Gist options
  • Save omega8cc/482407 to your computer and use it in GitHub Desktop.
Save omega8cc/482407 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
wtf.diff.txt
Only in /var/backups/8/2/aegir/config/includes: fastcgi_params.conf
Only in /var/aegir/config/includes: nginx_advanced_include.conf
Only in /var/backups/8/2/aegir/config/includes: nginx_include.conf
Only in /var/aegir/config/includes: nginx_simple_include.conf
Only in /var/backups/8/2/aegir/config/server_master/nginx/vhost.d: ssl.v185.barracuda.us.host8.biz
Only in /var/backups/8/2/aegir/config/server_master/nginx/vhost.d: test.v185.barracuda.us.host8.biz
diff -urp /var/backups/8/2/aegir/config/server_master/nginx/vhost.d/v185.barracuda.us.host8.biz /var/aegir/config/server_master/nginx/vhost.d/v185.barracuda.us.host8.biz
--- /var/backups/8/2/aegir/config/server_master/nginx/vhost.d/v185.barracuda.us.host8.biz 2010-07-18 14:30:02.000000000 +0000
+++ /var/aegir/config/server_master/nginx/vhost.d/v185.barracuda.us.host8.biz 2010-07-20 00:44:02.000000000 +0000
@@ -1,11 +1,9 @@
-
-
server {
limit_conn gulag 10; # like mod_evasive - this allows max 10 simultaneous connections from one IP address
- listen 173.231.133.185:80;
+ listen *:80;
server_name v185.barracuda.us.host8.biz;
root /var/aegir/hostmaster-HEAD;
index index.php index.html;
- include /var/aegir/config/includes/nginx_include.conf;
+ include /var/aegir/config/includes/nginx_simple_include.conf;
}
diff -urp /var/backups/8/2/aegir/config/server_master/nginx.conf /var/aegir/config/server_master/nginx.conf
--- /var/backups/8/2/aegir/config/server_master/nginx.conf 2010-07-18 13:50:02.000000000 +0000
+++ /var/aegir/config/server_master/nginx.conf 2010-07-20 00:43:31.000000000 +0000
@@ -4,10 +4,26 @@
### nginx.conf main
#######################################################
- ## MIME types & FastCGI params
- include /etc/nginx/fastcgi_params.conf;
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
+ ## FastCGI params
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param QUERY_STRING $query_string;
+ fastcgi_param REQUEST_METHOD $request_method;
+ fastcgi_param CONTENT_TYPE $content_type;
+ fastcgi_param CONTENT_LENGTH $content_length;
+ fastcgi_param SCRIPT_NAME $fastcgi_script_name;
+ fastcgi_param REQUEST_URI $request_uri;
+ fastcgi_param DOCUMENT_URI $document_uri;
+ fastcgi_param DOCUMENT_ROOT $document_root;
+ fastcgi_param SERVER_PROTOCOL $server_protocol;
+ fastcgi_param GATEWAY_INTERFACE CGI/1.1;
+ fastcgi_param SERVER_SOFTWARE ApacheSolaris/$nginx_version;
+ fastcgi_param REMOTE_ADDR $remote_addr;
+ fastcgi_param REMOTE_PORT $remote_port;
+ fastcgi_param SERVER_ADDR $server_addr;
+ fastcgi_param SERVER_PORT $server_port;
+ fastcgi_param SERVER_NAME $server_name;
+ fastcgi_param REDIRECT_STATUS 200;
+ fastcgi_index index.php;
## Size Limits
client_body_buffer_size 64k;
@@ -21,43 +37,35 @@
## Timeouts
client_body_timeout 60;
client_header_timeout 60;
- keepalive_timeout 75 20;
send_timeout 60;
## General Options
ignore_invalid_headers on;
limit_zone gulag $binary_remote_addr 10m;
recursive_error_pages on;
- sendfile on;
## TCP options
- tcp_nodelay on;
tcp_nopush on;
## Compression
- gzip on;
gzip_buffers 16 8k;
gzip_comp_level 9;
gzip_http_version 1.1;
gzip_min_length 10;
gzip_types text/plain text/css image/png image/gif image/jpeg application/x-javascript text/xml application/xml application/xml+rss text/javascript image/x-icon;
gzip_vary on;
- gzip_static on;
gzip_proxied any;
gzip_disable "MSIE [1-6]\.";
- ## Upload Progress
- upload_progress uploads 1m;
-
## Log Format
log_format main '"$remote_addr" $host [$time_local] '
'"$request" $status $body_bytes_sent '
'$request_length $bytes_sent "$http_referer" '
'"$http_user_agent" $request_time "$gzip_ratio"';
- client_body_temp_path /var/cache/nginx/client_body_temp 1 2;
- access_log /var/log/nginx/access.log main;
- error_log /var/log/nginx/error.log crit;
+ client_body_temp_path /var/lib/nginx/body 1 2;
+ access_log /var/log/nginx/access.log main;
+ error_log /var/log/nginx/error.log crit;
#######################################################
@@ -66,20 +74,11 @@
server {
limit_conn gulag 10; # like mod_evasive - this allows max 10 simultaneous connections from one IP address
- listen 173.231.133.185:80;
-
server_name _;
-
location / {
root /var/www/nginx-default;
index index.html index.htm;
}
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /var/www/nginx-default;
- }
-
}
#######################################################
@@ -89,25 +88,3 @@ server {
# virtual hosts
include /var/aegir/config/server_master/nginx/vhost.d/*;
-
-#######################################################
-### nginx default ssl server
-#######################################################
-
-server {
- limit_conn gulag 10; # like mod_evasive - this allows max 10 simultaneous connections from one IP address
- listen 173.231.133.185:443;
-
- server_name _;
-
- location / {
- root /var/www/nginx-default;
- index index.html index.htm;
- }
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /var/www/nginx-default;
- }
-
-}
Only in /var/backups/8/2/aegir/config/server_master: ssl.d
Only in /var/backups/8/2/aegir/config: ssl.d
Only in /var/backups/8/2/aegir/.drush: platform_drupal617.alias.drushrc.php
diff -urp /var/backups/8/2/aegir/.drush/provision/aegir.make /var/aegir/.drush/provision/aegir.make
--- /var/backups/8/2/aegir/.drush/provision/aegir.make 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/aegir.make 2010-07-20 00:43:13.000000000 +0000
@@ -3,5 +3,5 @@ projects[] = "drupal"
projects[hostmaster][type] = "profile"
projects[hostmaster][download][type] = "git"
-projects[hostmaster][download][url] = "git://git.aegirproject.org/hostmaster.git"
+projects[hostmaster][download][url] = "git://github.com/omega8cc/hostmaster.git"
projects[hostmaster][download][branch] = "master"
diff -urp /var/backups/8/2/aegir/.drush/provision/.git/config /var/aegir/.drush/provision/.git/config
--- /var/backups/8/2/aegir/.drush/provision/.git/config 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/.git/config 2010-07-20 00:43:13.000000000 +0000
@@ -4,8 +4,8 @@
bare = false
logallrefupdates = true
[remote "origin"]
- url = git://git.aegirproject.org/provision.git
+ url = git://github.com/omega8cc/provision.git
fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "master"]
+[branch "dev-nginx"]
remote = origin
- merge = refs/heads/master
+ merge = refs/heads/dev-nginx
diff -urp /var/backups/8/2/aegir/.drush/provision/.git/HEAD /var/aegir/.drush/provision/.git/HEAD
--- /var/backups/8/2/aegir/.drush/provision/.git/HEAD 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/.git/HEAD 2010-07-20 00:43:13.000000000 +0000
@@ -1 +1 @@
-9f7c0de5b448dbddd2c5fee6cb121a39f06c6ac7
+ref: refs/heads/dev-nginx
Binary files /var/backups/8/2/aegir/.drush/provision/.git/index and /var/aegir/.drush/provision/.git/index differ
diff -urp /var/backups/8/2/aegir/.drush/provision/.git/logs/HEAD /var/aegir/.drush/provision/.git/logs/HEAD
--- /var/backups/8/2/aegir/.drush/provision/.git/logs/HEAD 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/.git/logs/HEAD 2010-07-20 00:43:13.000000000 +0000
@@ -1,2 +1 @@
-0000000000000000000000000000000000000000 d49ea0d2d44935d509fb6bb3c4ac1fd57a9d0cb8 root <root@v185.barracuda.us.host8.biz> 1279461808 +0000 clone: from git://git.aegirproject.org/provision.git
-d49ea0d2d44935d509fb6bb3c4ac1fd57a9d0cb8 9f7c0de5b448dbddd2c5fee6cb121a39f06c6ac7 root <root@v185.barracuda.us.host8.biz> 1279461808 +0000 checkout: moving from master to origin/dev-nginx
+0000000000000000000000000000000000000000 3a57ec50e056accb896a98cd87d3e7ae27065ba4 aegir <aegir@v185.barracuda.us.host8.biz> 1279586593 +0000 clone: from git://github.com/omega8cc/provision.git
Only in /var/aegir/.drush/provision/.git/logs/refs/heads: dev-nginx
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/heads: master
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-dns
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-envobject
diff -urp /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin/dev-nginx /var/aegir/.drush/provision/.git/logs/refs/remotes/origin/dev-nginx
--- /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin/dev-nginx 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/.git/logs/refs/remotes/origin/dev-nginx 2010-07-20 00:43:13.000000000 +0000
@@ -1 +1 @@
-0000000000000000000000000000000000000000 9f7c0de5b448dbddd2c5fee6cb121a39f06c6ac7 root <root@v185.barracuda.us.host8.biz> 1279461808 +0000 clone: from git://git.aegirproject.org/provision.git
+0000000000000000000000000000000000000000 3a57ec50e056accb896a98cd87d3e7ae27065ba4 aegir <aegir@v185.barracuda.us.host8.biz> 1279586593 +0000 clone: from git://github.com/omega8cc/provision.git
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-platform_management
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-ports
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-purgebackup
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-restore
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev_server_verify
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-services
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-site_rename
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: dev-ssl
diff -urp /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin/HEAD /var/aegir/.drush/provision/.git/logs/refs/remotes/origin/HEAD
--- /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin/HEAD 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/.git/logs/refs/remotes/origin/HEAD 2010-07-20 00:43:13.000000000 +0000
@@ -1 +1 @@
-0000000000000000000000000000000000000000 d49ea0d2d44935d509fb6bb3c4ac1fd57a9d0cb8 root <root@v185.barracuda.us.host8.biz> 1279461808 +0000 clone: from git://git.aegirproject.org/provision.git
+0000000000000000000000000000000000000000 3a57ec50e056accb896a98cd87d3e7ae27065ba4 aegir <aegir@v185.barracuda.us.host8.biz> 1279586593 +0000 clone: from git://github.com/omega8cc/provision.git
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: master
Only in /var/backups/8/2/aegir/.drush/provision/.git/logs/refs/remotes/origin: ssl
Only in /var/backups/8/2/aegir/.drush/provision/.git/objects/pack: pack-08e53eb995646b9dfa09c08a83020455e1998437.idx
Only in /var/backups/8/2/aegir/.drush/provision/.git/objects/pack: pack-08e53eb995646b9dfa09c08a83020455e1998437.pack
Only in /var/aegir/.drush/provision/.git/objects/pack: pack-631d9bb7c5c6e13c985c1a42c3b62dfa379ef42a.idx
Only in /var/aegir/.drush/provision/.git/objects/pack: pack-631d9bb7c5c6e13c985c1a42c3b62dfa379ef42a.pack
Only in /var/backups/8/2/aegir/.drush/provision/.git/objects/pack: pack-a7a6d29ca3aa6795b219e6588dd8237ce8020240.idx
Only in /var/backups/8/2/aegir/.drush/provision/.git/objects/pack: pack-a7a6d29ca3aa6795b219e6588dd8237ce8020240.pack
Only in /var/aegir/.drush/provision/.git/refs/heads: dev-nginx
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/heads: master
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-dns
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-envobject
diff -urp /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin/dev-nginx /var/aegir/.drush/provision/.git/refs/remotes/origin/dev-nginx
--- /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin/dev-nginx 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/.git/refs/remotes/origin/dev-nginx 2010-07-20 00:43:13.000000000 +0000
@@ -1 +1 @@
-9f7c0de5b448dbddd2c5fee6cb121a39f06c6ac7
+3a57ec50e056accb896a98cd87d3e7ae27065ba4
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-platform_management
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-ports
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-purgebackup
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-restore
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev_server_verify
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-services
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-site_rename
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: dev-ssl
diff -urp /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin/HEAD /var/aegir/.drush/provision/.git/refs/remotes/origin/HEAD
--- /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin/HEAD 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/.git/refs/remotes/origin/HEAD 2010-07-20 00:43:13.000000000 +0000
@@ -1 +1 @@
-ref: refs/remotes/origin/master
+ref: refs/remotes/origin/dev-nginx
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: master
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/remotes/origin: ssl
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-5--0-1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-5--0-1-ALPHA1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-5--0-1-ALPHA2
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-5--0-1-ALPHA3
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-5--0-1-BETA1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-5--0-1-BETA2
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-5--0-1-RC1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-5--0-2-ALPHA1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-1-BETA2
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-1-RC1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-2
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-2-BETA1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-2-RC1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-3
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-3-RC1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-3-RC2
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-3-RC3
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-3-RC4
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-4-ALPHA1
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-4-ALPHA2
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: DRUPAL-6--0-4-ALPHA3
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: hostmaster-0.4-alpha6
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: provision-0.4-alpha3
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: provision-0.4-alpha4
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: provision-0.4-alpha5
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: provision-0.4-alpha6
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: provision-0.4-alpha7
Only in /var/backups/8/2/aegir/.drush/provision/.git/refs/tags: provision-0.4-alpha8
diff -urp /var/backups/8/2/aegir/.drush/provision/http/http.config.inc /var/aegir/.drush/provision/http/http.config.inc
--- /var/backups/8/2/aegir/.drush/provision/http/http.config.inc 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/http.config.inc 2010-07-20 00:43:13.000000000 +0000
@@ -101,6 +101,32 @@ class provisionConfig_http_site extends
return $this->data['http_vhostd_path'] . '/' . $this->uri;
}
+ function write() {
+ parent::write();
+
+ // We also leave a record of this IP in the site's drushrc.php
+ // This way we can pass the info back to the front end.
+ $ip_addresses = drush_get_option('site_ip_addresses', array(), 'site');
+
+ if ($this->data['ip_address'] != '*') {
+ $ip_addresses[$this->data['server']->name] = $this->data['ip_address'];
+ }
+ elseif (isset($context['site_ip_addresses'][$this->data['server']->name])) {
+ unset($ip_addresses[$this->data['server']->name]);
+ }
+ drush_set_option('site_ip_addresses', $ip_addresses, 'site');
+ }
+
+ function unlink() {
+ parent::unlink();
+
+ // We also remove the record of this IP in the site's drushrc.php
+ // This way we can pass the info back to the front end.
+ $ip_addresses = drush_get_option('site_ip_addresses', array(), 'site');
+ unset($ip_addresses[$this->data['server']->name]);
+ drush_set_option('site_ip_addresses', $ip_addresses, 'site');
+ }
+
function process() {
parent::process();
diff -urp /var/backups/8/2/aegir/.drush/provision/http/http.ssl.inc /var/aegir/.drush/provision/http/http.ssl.inc
--- /var/backups/8/2/aegir/.drush/provision/http/http.ssl.inc 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/http.ssl.inc 2010-07-20 00:43:13.000000000 +0000
@@ -64,13 +64,6 @@ class provisionService_http_ssl extends
else {
$data['ip_address'] = $ip;
- // We also leave a record of this IP in the site's drushrc.php
- // This way we can pass the info back to the front end.
- $context =& drush_get_context('site');
- if (!is_array($context['site_ip_addresses'])) {
- $context['site_ip_addresses'] = array();
- }
- $context['site_ip_addresses'][$this->server->name] = $ip;
}
}
}
@@ -340,11 +333,6 @@ class provisionConfig_http_ssl_site exte
'%site' => $this->uri,
'%server' => $this->data['server']->remote_host)));
-
- $ip_addresses = drush_get_option('site_ip_addresses', array(), 'site');
- unset($ip_addresses[$this->data['server']->name]);
- drush_set_option('site_ip_addresses', $ip_addresses, 'site');
-
$used = provisionService_http_ssl::certificate_in_use($this->ssl_key, $this->data['server']);
if (!$used) {
Only in /var/aegir/.drush/provision/http/nginx: nginx_advanced_include.conf
diff -urp /var/backups/8/2/aegir/.drush/provision/http/nginx/nginx.conf /var/aegir/.drush/provision/http/nginx/nginx.conf
--- /var/backups/8/2/aegir/.drush/provision/http/nginx/nginx.conf 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/nginx/nginx.conf 2010-07-20 00:43:13.000000000 +0000
@@ -1,28 +1,41 @@
###########################################################
-# This file should replace existing /etc/nginx/nginx.conf #
+# This is vanilla /etc/nginx/nginx.conf file +comments #
###########################################################
#
# HOW-TO:
#
# ln -s /var/aegir/config/nginx.conf /etc/nginx/conf.d/aegir.conf
-# ln -s /var/aegir/config/includes/fastcgi_params.conf /etc/nginx/fastcgi_params.conf
# sudo /etc/init.d/nginx restart
#
+# /etc/sudoers configuration:
+# aegir ALL=NOPASSWD: /etc/init.d/nginx
#
-# /etc/sudoers configuration::
-# aegir ALL=NOPASSWD: /etc/init.d/nginx
#
-#
-pid /var/run/nginx.pid;
-user www-data www-data;
-worker_processes 4;
-worker_rlimit_nofile 8192;
+user www-data;
+worker_processes 1;
+
+error_log /var/log/nginx/error.log;
+pid /var/run/nginx.pid;
events {
- worker_connections 4096;
- use epoll;
+ worker_connections 1024;
}
http {
- include /etc/nginx/conf.d/aegir.conf;
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ access_log /var/log/nginx/access.log;
+
+ sendfile on;
+ #tcp_nopush on;
+
+ #keepalive_timeout 0;
+ keepalive_timeout 65;
+ tcp_nodelay on;
+
+ gzip on;
+
+ include /etc/nginx/conf.d/*.conf;
+ include /etc/nginx/sites-enabled/*;
}
diff -urp /var/backups/8/2/aegir/.drush/provision/http/nginx/nginx_service.inc /var/aegir/.drush/provision/http/nginx/nginx_service.inc
--- /var/backups/8/2/aegir/.drush/provision/http/nginx/nginx_service.inc 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/nginx/nginx_service.inc 2010-07-20 00:43:13.000000000 +0000
@@ -15,14 +15,28 @@ class provisionService_http_nginx extend
parent::init();
$this->configs['server'][] = 'provisionConfig_nginx_server';
$this->configs['site'][] = 'provisionConfig_nginx_site';
+
+ /**
+ * TODO: This is ugly, we need a different hook for save commands probably.
+ */
+ $command = drush_get_command();
+
+ if ($command['command'] == 'provision-save') {
+ // Check if some nginx features are supported and save them for later.
+ $this->server->shell_exec('nginx -V');
+ $this->server->nginx_has_gzip = preg_match("/(with-http_gzip_static_module)/", implode('', trim(drush_shell_exec_output())), $match);
+ $this->server->nginx_has_upload_progress = preg_match("/(nginx-upload-progress-module)/", implode('', trim(drush_shell_exec_output())), $match);
+ $this->server->nginx_has_new_version = preg_match("/(nginx\/0\.8\.)/", implode('', trim(drush_shell_exec_output())), $match);
+ }
+
}
function verify() {
if ($this->context->type === 'server') {
- provision_file()->copy(dirname(__FILE__) . '/nginx_include.conf', $this->server->include_path . '/nginx_include.conf');
- $this->sync($this->server->include_path . '/nginx_include.conf');
- provision_file()->copy(dirname(__FILE__) . '/fastcgi_params.conf', $this->server->include_path . '/fastcgi_params.conf');
- $this->sync($this->server->include_path . '/fastcgi_params.conf');
+ provision_file()->copy(dirname(__FILE__) . '/nginx_advanced_include.conf', $this->server->include_path . '/nginx_advanced_include.conf');
+ $this->sync($this->server->include_path . '/nginx_advanced_include.conf');
+ provision_file()->copy(dirname(__FILE__) . '/nginx_simple_include.conf', $this->server->include_path . '/nginx_simple_include.conf');
+ $this->sync($this->server->include_path . '/nginx_simple_include.conf');
}
// Call the parent at the end. it will restart the server when it finishes.
parent::verify();
Only in /var/aegir/.drush/provision/http/nginx: nginx_simple_include.conf
diff -urp /var/backups/8/2/aegir/.drush/provision/http/nginx/server.tpl.php /var/aegir/.drush/provision/http/nginx/server.tpl.php
--- /var/backups/8/2/aegir/.drush/provision/http/nginx/server.tpl.php 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/nginx/server.tpl.php 2010-07-20 00:43:13.000000000 +0000
@@ -4,10 +4,26 @@
### nginx.conf main
#######################################################
- ## MIME types & FastCGI params
- include /etc/nginx/fastcgi_params.conf;
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
+ ## FastCGI params
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param QUERY_STRING $query_string;
+ fastcgi_param REQUEST_METHOD $request_method;
+ fastcgi_param CONTENT_TYPE $content_type;
+ fastcgi_param CONTENT_LENGTH $content_length;
+ fastcgi_param SCRIPT_NAME $fastcgi_script_name;
+ fastcgi_param REQUEST_URI $request_uri;
+ fastcgi_param DOCUMENT_URI $document_uri;
+ fastcgi_param DOCUMENT_ROOT $document_root;
+ fastcgi_param SERVER_PROTOCOL $server_protocol;
+ fastcgi_param GATEWAY_INTERFACE CGI/1.1;
+ fastcgi_param SERVER_SOFTWARE ApacheSolaris/$nginx_version;
+ fastcgi_param REMOTE_ADDR $remote_addr;
+ fastcgi_param REMOTE_PORT $remote_port;
+ fastcgi_param SERVER_ADDR $server_addr;
+ fastcgi_param SERVER_PORT $server_port;
+ fastcgi_param SERVER_NAME $server_name;
+ fastcgi_param REDIRECT_STATUS 200;
+ fastcgi_index index.php;
## Size Limits
client_body_buffer_size 64k;
@@ -21,33 +37,33 @@
## Timeouts
client_body_timeout 60;
client_header_timeout 60;
- keepalive_timeout 75 20;
send_timeout 60;
## General Options
ignore_invalid_headers on;
limit_zone gulag $binary_remote_addr 10m;
recursive_error_pages on;
- sendfile on;
## TCP options
- tcp_nodelay on;
tcp_nopush on;
## Compression
- gzip on;
gzip_buffers 16 8k;
gzip_comp_level 9;
gzip_http_version 1.1;
gzip_min_length 10;
gzip_types text/plain text/css image/png image/gif image/jpeg application/x-javascript text/xml application/xml application/xml+rss text/javascript image/x-icon;
gzip_vary on;
- gzip_static on;
gzip_proxied any;
gzip_disable "MSIE [1-6]\.";
-
- ## Upload Progress
- upload_progress uploads 1m;
+<?php
+if ($server->nginx_has_gzip) {
+ print ' gzip_static on\;';
+}
+if ($server->nginx_has_upload_progress) {
+ print ' upload_progress uploads 1m\;';
+}
+?>
## Log Format
log_format main '"$remote_addr" $host [$time_local] '
@@ -55,9 +71,9 @@
'$request_length $bytes_sent "$http_referer" '
'"$http_user_agent" $request_time "$gzip_ratio"';
- client_body_temp_path /var/cache/nginx/client_body_temp 1 2;
- access_log /var/log/nginx/access.log main;
- error_log /var/log/nginx/error.log crit;
+ client_body_temp_path /var/lib/nginx/body 1 2;
+ access_log /var/log/nginx/access.log main;
+ error_log /var/log/nginx/error.log crit;
#######################################################
@@ -66,20 +82,14 @@
server {
limit_conn gulag 10; # like mod_evasive - this allows max 10 simultaneous connections from one IP address
- listen <?php print $ip_address . ':' . $http_port; ?>;
-
+<?php foreach ($server->ip_addresses as $ip) : ?>
+ listen <?php print $ip . ':' . $http_port; ?>;
+<?php endforeach; ?>
server_name _;
-
location / {
root /var/www/nginx-default;
index index.html index.htm;
}
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /var/www/nginx-default;
- }
-
}
#######################################################
diff -urp /var/backups/8/2/aegir/.drush/provision/http/nginx/vhost_disabled.tpl.php /var/aegir/.drush/provision/http/nginx/vhost_disabled.tpl.php
--- /var/backups/8/2/aegir/.drush/provision/http/nginx/vhost_disabled.tpl.php 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/nginx/vhost_disabled.tpl.php 2010-07-20 00:43:13.000000000 +0000
@@ -3,7 +3,6 @@ server {
server_name <?php print $this->uri; ?><?php if (is_array($this->aliases)) : foreach ($this->aliases as $alias_url) : if (trim($alias_url)) : ?> <?php print $alias_url; ?><?php endif; endforeach; endif; ?>;
root <?php print $this->root; ?>;
index index.php index.html;
-
location / {
root /var/www/nginx-default;
index index.html index.htm;
diff -urp /var/backups/8/2/aegir/.drush/provision/http/nginx/vhost.tpl.php /var/aegir/.drush/provision/http/nginx/vhost.tpl.php
--- /var/backups/8/2/aegir/.drush/provision/http/nginx/vhost.tpl.php 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/nginx/vhost.tpl.php 2010-07-20 00:43:13.000000000 +0000
@@ -1,11 +1,17 @@
-
server {
limit_conn gulag 10; # like mod_evasive - this allows max 10 simultaneous connections from one IP address
listen <?php print $ip_address . ':' . $http_port; ?>;
server_name <?php print $this->uri; ?><?php if (!$this->redirection && is_array($this->aliases)) : foreach ($this->aliases as $alias_url) : if (trim($alias_url)) : ?> <?php print $alias_url; ?><?php endif; endforeach; endif; ?>;
root <?php print $this->root; ?>;
index index.php index.html;
- include <?php print $server->include_path ?>/nginx_include.conf;
+<?php
+ if ($server->nginx_has_new_version || $server->nginx_has_upload_progress) {
+ print ' include ' . $server->include_path . '/nginx_advanced_include.conf';
+ }
+ else {
+ print ' include ' . $server->include_path . '/nginx_simple_include.conf';
+ }
+?>;
}
<?php
diff -urp /var/backups/8/2/aegir/.drush/provision/http/nginx_ssl/nginx_ssl_service.inc /var/aegir/.drush/provision/http/nginx_ssl/nginx_ssl_service.inc
--- /var/backups/8/2/aegir/.drush/provision/http/nginx_ssl/nginx_ssl_service.inc 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/nginx_ssl/nginx_ssl_service.inc 2010-07-20 00:43:13.000000000 +0000
@@ -45,14 +45,28 @@ class provisionService_http_nginx_ssl ex
// Replace the server config with our own. See the class for more info.
$this->configs['server'][] = 'provisionConfig_nginx_ssl_server';
$this->configs['site'][] = 'provisionConfig_nginx_ssl_site';
+
+ /**
+ * TODO: This is ugly, we need a different hook for save commands probably.
+ */
+ $command = drush_get_command();
+
+ if ($command['command'] == 'provision-save') {
+ // Check if some nginx features are supported and save them for later.
+ $this->server->shell_exec('nginx -V');
+ $this->server->nginx_has_gzip = preg_match("/(with-http_gzip_static_module)/", implode('', trim(drush_shell_exec_output())), $match);
+ $this->server->nginx_has_upload_progress = preg_match("/(nginx-upload-progress-module)/", implode('', trim(drush_shell_exec_output())), $match);
+ $this->server->nginx_has_new_version = preg_match("/(nginx\/0\.8\.)/", implode('', trim(drush_shell_exec_output())), $match);
+ }
+
}
function verify() {
if ($this->context->type === 'server') {
- provision_file()->copy(dirname(__FILE__) . '/nginx_include.conf', $this->server->include_path . '/nginx_include.conf');
- $this->sync($this->server->include_path . '/nginx_include.conf');
- provision_file()->copy(dirname(__FILE__) . '/fastcgi_params.conf', $this->server->include_path . '/fastcgi_params.conf');
- $this->sync($this->server->include_path . '/fastcgi_params.conf');
+ provision_file()->copy(dirname(__FILE__) . '/nginx_advanced_include.conf', $this->server->include_path . '/nginx_advanced_include.conf');
+ $this->sync($this->server->include_path . '/nginx_advanced_include.conf');
+ provision_file()->copy(dirname(__FILE__) . '/nginx_simple_include.conf', $this->server->include_path . '/nginx_simple_include.conf');
+ $this->sync($this->server->include_path . '/nginx_simple_include.conf');
}
// Call the parent at the end. it will restart the server when it finishes.
parent::verify();
diff -urp /var/backups/8/2/aegir/.drush/provision/http/nginx_ssl/server_ssl.tpl.php /var/aegir/.drush/provision/http/nginx_ssl/server_ssl.tpl.php
--- /var/backups/8/2/aegir/.drush/provision/http/nginx_ssl/server_ssl.tpl.php 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/nginx_ssl/server_ssl.tpl.php 2010-07-20 00:43:13.000000000 +0000
@@ -11,17 +11,9 @@ server {
<?php
endforeach;
?>
-
server_name _;
-
location / {
root /var/www/nginx-default;
index index.html index.htm;
}
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /var/www/nginx-default;
- }
-
}
diff -urp /var/backups/8/2/aegir/.drush/provision/http/nginx_ssl/vhost_ssl.tpl.php /var/aegir/.drush/provision/http/nginx_ssl/vhost_ssl.tpl.php
--- /var/backups/8/2/aegir/.drush/provision/http/nginx_ssl/vhost_ssl.tpl.php 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/http/nginx_ssl/vhost_ssl.tpl.php 2010-07-20 00:43:13.000000000 +0000
@@ -14,7 +14,14 @@ server {
ssl_protocols SSLv2 SSLv3 TLSv1;
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
ssl_prefer_server_ciphers on;
- include <?php print $server->include_path ?>/nginx_include.conf;
+<?php
+ if ($server->nginx_has_new_version || $server->nginx_has_upload_progress) {
+ print ' include ' . $server->include_path . '/nginx_advanced_include.conf';
+ }
+ else {
+ print ' include ' . $server->include_path . '/nginx_simple_include.conf';
+ }
+?>;
}
<?php endif; ?>
@@ -33,18 +40,11 @@ server {
server_name <?php print $this->uri; ?> <?php if (!$this->redirection && is_array($this->aliases)) : foreach ($this->aliases as $alias_url) : if (trim($alias_url)) : ?> <?php $alias_url = "." . $alias_url; ?> <?php print $alias_url; ?> <?php endif; endforeach; endif; ?>;
root <?php print $this->root; ?>;
index index.php index.html;
-
location / {
root /var/www/nginx-default;
index index.html index.htm;
rewrite ^/(.*)$ <?php print $ssl_redirect_url ?>/$1 permanent;
}
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /var/www/nginx-default;
- }
-
}
<?php endif; ?>
Only in /var/backups/8/2/aegir/.drush/provision/http: nginx_ssl
diff -urp /var/backups/8/2/aegir/.drush/provision/platform/provision_drupal.drush.inc /var/aegir/.drush/provision/platform/provision_drupal.drush.inc
--- /var/backups/8/2/aegir/.drush/provision/platform/provision_drupal.drush.inc 2010-07-18 14:03:28.000000000 +0000
+++ /var/aegir/.drush/provision/platform/provision_drupal.drush.inc 2010-07-20 00:43:13.000000000 +0000
@@ -238,10 +238,18 @@ function _provision_find_profiles() {
$profile->filename = $file;
_provision_cvs_deploy($profile);
+
+ $profile->info = array();
+
+ $info_file = "./profiles/$name/$name.info";
+ if (file_exists($info_file)) {
+ $profile->info = provision_parse_info_file($info_file);
+ }
+
require_once($profile->filename);
$func = $profile->name . "_profile_details";
if (function_exists($func)) {
- $profile->info = $func();
+ $profile->info = array_merge($profile->info, $func());
}
$languages['en'] = 1;
diff -urp /var/backups/8/2/aegir/.drush/server_master.alias.drushrc.php /var/aegir/.drush/server_master.alias.drushrc.php
--- /var/backups/8/2/aegir/.drush/server_master.alias.drushrc.php 2010-07-18 13:50:02.000000000 +0000
+++ /var/aegir/.drush/server_master.alias.drushrc.php 2010-07-20 00:43:31.000000000 +0000
@@ -6,16 +6,15 @@ $aliases['server_master'] = array (
'script_user' => 'aegir',
'ip_addresses' =>
array (
- 0 => '173.231.133.185',
),
'backup_path' => '/var/aegir/backups',
'config_path' => '/var/aegir/config/server_master',
'include_path' => '/var/aegir/config/includes',
'master_url' => 'http://v185.barracuda.us.host8.biz/',
- 'db_port' => '3306',
- 'master_db' => 'mysql://aegir_root:u8gs2Kc5eK@v185.barracuda.us.host8.biz',
+ 'db_port' => 3306,
+ 'master_db' => 'mysql://aegir_root:u8gs2Kc5eK@localhost',
'db_service_type' => 'mysql',
- 'http_port' => '80',
+ 'http_port' => 80,
'http_restart_cmd' => 'sudo /etc/init.d/nginx reload',
'web_group' => 'www-data',
'web_disable_url' => 'http://v185.barracuda.us.host8.biz//hosting/disabled',
@@ -23,8 +22,8 @@ $aliases['server_master'] = array (
'http_confd_path' => '/var/aegir/config/server_master/nginx/conf.d',
'http_platformd_path' => '/var/aegir/config/server_master/nginx/platform.d',
'http_vhostd_path' => '/var/aegir/config/server_master/nginx/vhost.d',
- 'http_ssl_port' => '443',
- 'ssld_path' => '/var/aegir/config/ssl.d',
- 'http_ssld_path' => '/var/aegir/config/server_master/ssl.d',
- 'http_service_type' => 'nginx_ssl',
+ 'nginx_has_gzip' => 0,
+ 'nginx_has_upload_progress' => 0,
+ 'nginx_has_new_version' => 0,
+ 'http_service_type' => 'nginx',
);
Only in /var/backups/8/2/aegir/.drush: ssl.v185.barracuda.us.host8.biz.alias.drushrc.php
Only in /var/backups/8/2/aegir/.drush: test.v185.barracuda.us.host8.biz.alias.drushrc.php
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/drushrc.php /var/aegir/hostmaster-HEAD/drushrc.php
--- /var/backups/8/2/aegir/hostmaster-HEAD/drushrc.php 2010-07-18 13:50:02.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/drushrc.php 2010-07-20 00:44:01.000000000 +0000
@@ -1394,6 +1394,30 @@ $options['packages'] = array (
'project' => '',
'version' => NULL,
),
+ 'hosting_nginx_ssl' =>
+ array (
+ 'filename' => '/var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/nginx/ssl/hosting_nginx_ssl.module',
+ 'basename' => 'hosting_nginx_ssl.module',
+ 'name' => 'hosting_nginx_ssl',
+ 'info' =>
+ array (
+ 'name' => 'Nginx +SSL servers',
+ 'description' => 'Allow hostmaster to configure NGINX web servers with SSL support.',
+ 'package' => 'Hosting',
+ 'dependencies' =>
+ array (
+ 0 => 'hosting_web_server',
+ 1 => 'hosting_ssl',
+ 2 => 'hosting_nginx',
+ ),
+ 'core' => '6.x',
+ 'version' => NULL,
+ 'php' => '4.3.5',
+ ),
+ 'schema_version' => 0,
+ 'project' => '',
+ 'version' => NULL,
+ ),
'hosting_nginx' =>
array (
'filename' => '/var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/nginx/hosting_nginx.module',
@@ -1456,7 +1480,7 @@ $options['packages'] = array (
'version' => NULL,
'php' => '4.3.5',
),
- 'schema_version' => '6004',
+ 'schema_version' => '6005',
'project' => '',
'version' => NULL,
),
Only in /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster: .git
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/hostmaster.profile /var/aegir/hostmaster-HEAD/profiles/hostmaster/hostmaster.profile
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/hostmaster.profile 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/hostmaster.profile 2010-07-20 00:43:38.000000000 +0000
@@ -34,7 +34,7 @@ function hostmaster_profile_tasks(&$task
// add support for nginx
if (d()->platform->server->http_service_type === 'nginx') {
- drupal_install_modules(array('hosting_nginx','hosting_ssl'));
+ drupal_install_modules(array('hosting_nginx','hosting_ssl','hosting_nginx_ssl'));
}
// Bootstrap and create all the initial nodes
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/migrate/hosting_migrate.batch.inc /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/migrate/hosting_migrate.batch.inc
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/migrate/hosting_migrate.batch.inc 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/migrate/hosting_migrate.batch.inc 2010-07-20 00:43:37.000000000 +0000
@@ -197,7 +197,7 @@ function hosting_migrate_platform_batch(
$batch['form_state']['storage']['status'][$site->nid] = $status;
$batch['form_state']['storage']['instance'][$site->nid] = $profile_instance->iid;
// If there were no errors, this site passes and can be migrated
- if (!$status['error'] && $profile->title != 'hostmaster') { // The hostmaster site can not be upgraded via the interface.
+ if (!$status['error'] && $profile->short_name != 'hostmaster') { // The hostmaster site can not be upgraded via the interface.
$batch['form_state']['storage']['passed'][$site->nid] = $site->title;
return true;
}
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/package/hosting_package.module /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/package/hosting_package.module
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/package/hosting_package.module 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/package/hosting_package.module 2010-07-20 00:43:37.000000000 +0000
@@ -101,7 +101,7 @@ function hosting_package_access($op, $no
}
}
-function hosting_get_profiles($platform = NULL) {
+function hosting_get_profiles($platform = NULL, $field = 'title') {
$profiles = array();
if (!is_null($platform)) {
$instances = hosting_package_instances_load(array(
@@ -109,24 +109,57 @@ function hosting_get_profiles($platform
'n.status' => 1));
foreach ($instances as $iid => $instance) {
- $profiles[$instance->package_id] = $instance->title;
+ $profiles[$instance->package_id] = $instance->$field;
}
}
else {
- $result = db_query("SELECT n.nid, n.title FROM {node} n LEFT JOIN {hosting_package} p ON n.vid = p.vid WHERE p.package_type = 'profile'");
- while ($profile = db_fetch_object($result)) {
- $profiles[$profile->nid] = $profile->title;
+ $instances = hosting_package_instances_load(array(
+ 'package_type' => 'profile',
+ 'n.status' => 1,
+ 'r.type' => 'platform'));
+
+ foreach ($instances as $iid => $instance) {
+ $profiles[$instance->package_id] = $instance->$field;
}
}
return $profiles;
}
+
+function hosting_get_profile_platforms($profile) {
+ $defaults = array('default', 'standard', 'minimal');
+
+ $platforms = array();
+ $instances = hosting_package_instances_load(array(
+ 'package_id' => $profile,
+ 'n.status' => 1,
+ 'r.status' => 1,
+ 'r.type' => 'platform'));
+
+ foreach ($instances as $iid => $instance) {
+ $platform = node_load($instance->rid);
+ // this is one of the default profiles
+ if (in_array($instance->short_name, $defaults) &&
+ sizeof(array_diff(array_values($platform->profiles), $defaults)) &&
+ variable_get('hosting_ignore_default_profiles', TRUE)) {
+ // there are other profiles available on this platform. skip this.
+ continue;
+ }
+ if ($platform->platform_status != HOSTING_PLATFORM_DELETED) {
+ $platforms[$instance->rid] = $platform->title;
+ }
+ }
+
+ return $platforms;
+}
+
function hosting_get_profile_languages($profile = NULL, $platform = NULL) {
+ $languages['en'] = _hosting_language_name('en');
if ($profile && $platform) {
$instance = hosting_package_instance_load(array(
'rid' => $platform, 'package_id' => $profile));
- $languages = $instance->languages;
+ $languages = array_merge($languages, $instance->languages);
}
else {
$result = db_query("SELECT DISTINCT language FROM {hosting_package_languages}");
@@ -134,7 +167,6 @@ function hosting_get_profile_languages($
$languages[$lang->language] = _hosting_language_name($lang->language);
}
}
- $languages['en'] = _hosting_language_name('en');
return $languages;
}
@@ -177,6 +209,15 @@ function hosting_get_packages_by_type($t
return false;
}
+function hosting_get_default_profile($default = null) {
+ if ($p = hosting_get_package('default')) {
+ return $p->nid;
+ }
+ elseif ($p = hosting_get_package('standard')) {
+ return $p->nid;
+ }
+ return $default;
+}
function hosting_get_package($short_name) {
$result = db_query("SELECT nid FROM {hosting_package} WHERE short_name = '%s'", $short_name);
@@ -309,22 +350,29 @@ function hosting_package_sync(&$data) {
foreach ($data as $plural => $packages) {
$type = _hosting_package_plural_map($plural);
foreach ($packages as $short_name => $file) {
- $name = ($file['name']) ? $file['name'] : $short_name;
+ $name = ($file['info']['name']) ? $file['info']['name'] : $short_name;
if (!($package = hosting_get_package($short_name))) {
// Create a new package.
$package = new stdClass();
$package->type = 'package';
$package->uid = 1;
- $package->title = $name;
$package->package_type = $type;
$package->short_name = $short_name;
$package->old_short_name = $file['info']['old_short_name'];
- $package->description = $file['description'];
$package->status = 1;
- node_save($package);
}
+ // we only call node save when the title, description changes
+ // or when it's a new package.
+ if (!$package->nid ||
+ ($package->title != $name) ||
+ ($package->description != $file['info']['description'])) {
+ $package->title = $name;
+ $package->description = $file['info']['description'];
+
+ node_save($package);
+ }
$data[$plural][$short_name]['package_id'] = $package->nid;
}
}
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/platform/hosting_platform.module /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/platform/hosting_platform.module
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/platform/hosting_platform.module 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/platform/hosting_platform.module 2010-07-20 00:43:37.000000000 +0000
@@ -301,6 +301,7 @@ function hosting_platform_load($node) {
$additions = db_fetch_object(db_query('SELECT publish_path, verified, web_server, status AS platform_status FROM {hosting_platform} WHERE vid = %d', $node->vid));
$iid = db_result(db_query("SELECT iid FROM {hosting_package_instance} i left join {hosting_package} p on p.nid=i.package_id WHERE p.package_type='platform' AND i.rid=%d", $node->nid));
$additions->release = hosting_package_instance_load($iid);
+ $additions->profiles = hosting_get_profiles($node->nid, 'short_name');
return $additions;
}
@@ -326,9 +327,8 @@ function hosting_platform_node_load($arg
* Implementation of hook_view().
*/
function hosting_platform_view($node, $teaser = FALSE, $page = FALSE) {
-
-
modalframe_parent_js();
+
$node->content['info'] = array(
'#prefix' => '<div id="hosting-platform-info">',
'#suffix' => '</div>'
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/site/hosting_site.form.inc /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/site/hosting_site.form.inc
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/site/hosting_site.form.inc 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/site/hosting_site.form.inc 2010-07-20 00:43:37.000000000 +0000
@@ -103,6 +103,7 @@ function hosting_site_available_options(
$return = array();
$return['profile'] = array();
+ $return['platform'] = array();
$return['site_language'] = array();
if (!hosting_feature('client')) {
@@ -112,32 +113,26 @@ function hosting_site_available_options(
$return['client'] = null;
}
- if (isset($node->platform)) {
- // Install profiles
- $profiles = hosting_get_profiles($node->platform);
- foreach($profiles as $id => $name) {
- // Don't allow a site to be provisioned with hostslave or hostmaster profile
- if (in_array($name, array('hostslave', 'hostmaster'))) {
- unset($profiles[$id]);
- }
+ // Install profiles
+ $profiles = hosting_get_profiles();
+ foreach($profiles as $id => $name) {
+ // Don't allow a site to be provisioned with hostslave or hostmaster profile
+ if (in_array($name, array('Hostslave', 'Hostmaster'))) {
+ unset($profiles[$id]);
}
- reset($profiles);
- $return['profile'] = array_keys($profiles);
+ }
+ reset($profiles);
+ $return['profile'] = array_keys($profiles);
- if (sizeof($return['profile']) == 1) {
- $node->profile = $return['profile'][0];
- }
- if (isset($node->profile) && in_array($node->profile, $return['profile'])) {
- $return['site_language'] = array_keys((array) hosting_get_profile_languages($node->profile, $node->platform));
- }
+ if (!isset($node->profile)) {
+ $node->profile = hosting_get_default_profile($return['profile'][0]);
}
// filter the available platforms based on which clients the user has access to.
$user = user_load($GLOBALS['user']->uid);
$options = array();
- $platforms = _hosting_get_platforms();
-
+ $platforms = hosting_get_profile_platforms($node->profile);
if (sizeof($platforms)) {
foreach ($platforms as $nid => $title) {
$platform = node_load($nid);
@@ -152,6 +147,12 @@ function hosting_site_available_options(
$return['platform'] = $options;
}
+ if (!isset($node->platform) || !in_array($node->platform, $return['platform'])) {
+ $node->platform = $return['platform'][0];
+ }
+
+ $return['site_language'] = array_keys((array) hosting_get_profile_languages($node->profile, $node->platform));
+
drupal_alter('hosting_site_options', $return, $node);
return $return;
@@ -192,21 +193,11 @@ function hosting_site_form($node) {
'#autocomplete_path' => 'hosting_client/autocomplete/client',
), 'filter_xss', $editable);
-
- _hosting_site_field($form, $node, 'platform', array(
- '#type' => 'radios',
- '#title' => t('Platform'),
- '#required' => TRUE,
- '#description' => t('The platform you want the site to be hosted on.'),
- '#options' => _hosting_get_platforms(),
- '#default_value' => ($node->platform) ? $node->platform : HOSTING_DEFAULT_PLATFORM,
- ), '_hosting_node_link');
-
// Install profiles
$profiles = hosting_get_profiles();
foreach($profiles as $id => $name) {
// Don't allow a site to be provisioned with hostslave or hostmaster profile
- if (in_array($name, array('hostslave', 'hostmaster'))) {
+ if (in_array($name, array('Hostslave', 'Hostmaster'))) {
unset($profiles[$id]);
}
}
@@ -217,11 +208,22 @@ function hosting_site_form($node) {
'#title' => t('Install profile'),
'#description' => t('The type of site to install.'),
'#options' => $profiles,
- '#default_value' => $node->profile ? $node->profile : key($profiles),
+ '#default_value' => $node->profile ? $node->profile : hosting_get_default_profile(key($profiles)),
'#required' => TRUE,
'#attributes' => array('class' => "hosting-site-form-profile-options"),
), '_hosting_node_link');
+
+
+ _hosting_site_field($form, $node, 'platform', array(
+ '#type' => 'radios',
+ '#title' => t('Platform'),
+ '#required' => TRUE,
+ '#description' => t('The platform you want the site to be hosted on.'),
+ '#options' => _hosting_get_platforms(),
+ '#default_value' => ($node->platform) ? $node->platform : HOSTING_DEFAULT_PLATFORM,
+ ), '_hosting_node_link');
+
_hosting_site_field($form, $node, 'site_language', array(
'#type' => 'radios',
'#title' => t('Language'),
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/site/hosting_site.nodeapi.inc /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/site/hosting_site.nodeapi.inc
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/site/hosting_site.nodeapi.inc 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/site/hosting_site.nodeapi.inc 2010-07-20 00:43:37.000000000 +0000
@@ -131,12 +131,8 @@ function hosting_site_delete($node) {
/**
* Implementation of hook_nodeapi().
*/
-function hosting_site_nodeapi(&$node, $op, $teaser, $page) {
- switch($op) {
- case 'presave':
- $node->title = strtolower(trim($node->title)); // domain names are case-insensitive
- break;
- }
+function hosting_site_nodeapi_site_presave(&$node) {
+ $node->title = strtolower(trim($node->title)); // domain names are case-insensitive
}
/**
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/task/hosting_task.module /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/task/hosting_task.module
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/task/hosting_task.module 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/task/hosting_task.module 2010-07-20 00:43:37.000000000 +0000
@@ -81,7 +81,7 @@ function hosting_task_menu_access($node,
if (!in_array($task, $safe_tasks)) {
// Don't show certain tasks if the site is the 'special' main aegir site
$profile = node_load($node->profile);
- if ($profile->title == 'hostmaster') {
+ if ($profile->short_name == 'hostmaster') {
return FALSE;
}
}
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_cluster/hosting_web_cluster.service.inc /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_cluster/hosting_web_cluster.service.inc
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_cluster/hosting_web_cluster.service.inc 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_cluster/hosting_web_cluster.service.inc 2010-07-20 00:43:37.000000000 +0000
@@ -30,11 +30,17 @@ class hostingService_http_cluster extend
function load() {
parent::load();
+ $ssl_enabled = TRUE;
+
$web_servers = array();
$result = db_query('SELECT web_server_nid FROM {hosting_web_cluster} WHERE vid = %d', $this->server->vid);
while ($web_server = db_fetch_object($result)) {
$web_servers[] = $web_server->web_server_nid;
+ $server = node_load($web_server->web_server_nid);
+ $ssl_enabled = $ssl_enabled && $server->services['http']->ssl_enabled;
}
+
+ $this->ssl_enabled = $ssl_enabled;
$this->setValues(array('web_servers' => drupal_map_assoc($web_servers)));
}
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/nginx/hosting.feature.nginx.inc /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/nginx/hosting.feature.nginx.inc
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/nginx/hosting.feature.nginx.inc 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/nginx/hosting.feature.nginx.inc 2010-07-20 00:43:37.000000000 +0000
@@ -6,6 +6,7 @@ function hosting_nginx_hosting_feature()
'description' => t('Provide support for the NGINX web server.'),
'status' => HOSTING_FEATURE_DISABLED,
'module' => 'hosting_nginx',
+ 'group' => 'experimental'
);
return $features;
}
Only in /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/nginx: ssl
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting.feature.ssl.inc /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting.feature.ssl.inc
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting.feature.ssl.inc 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting.feature.ssl.inc 2010-07-20 00:43:37.000000000 +0000
@@ -6,6 +6,7 @@ function hosting_ssl_hosting_feature() {
'description' => t('Provides a service to expose a site encrypted by SSL certificates.'),
'status' => HOSTING_FEATURE_DISABLED,
'module' => 'hosting_ssl',
+ 'group' => 'experimental'
);
return $features;
}
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.module /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.module
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.module 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.module 2010-07-20 00:43:37.000000000 +0000
@@ -28,6 +28,40 @@ function hosting_ssl_get_servers() {
return $ssl_servers;
}
+/**
+ * Return a list of platforms on SSL enabled servers.
+ */
+function hosting_ssl_get_platforms() {
+ $servers = hosting_ssl_get_servers();
+ $ssl_platforms = array();
+
+ $platforms = _hosting_get_platforms();
+ foreach ($platforms as $nid => $title) {
+ $platform = node_load($nid);
+ if (in_array($platform->web_server, $servers)) {
+ $ssl_platforms[] = $nid;
+ }
+ }
+
+ return $ssl_platforms;
+}
+
+/**
+ * Return a list of profiles with SSL enabled platforms.
+ */
+function hosting_ssl_get_profiles() {
+ $platforms = hosting_ssl_get_platforms();
+
+ $ssl_profiles = array();
+ foreach ($platforms as $nid) {
+ $platform = node_load($nid);
+ $ssl_profiles = array_merge($ssl_profiles, array_keys($platform->profiles));
+ }
+
+ return array_unique($ssl_profiles);
+}
+
+
function hosting_ssl_form_alter(&$form, &$form_state, $form_id) {
if ($form_id == 'site_node_form') {
hosting_ssl_site_form($form, $form_state, $form_id);
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.nodeapi.inc /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.nodeapi.inc
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.nodeapi.inc 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.nodeapi.inc 2010-07-20 00:43:37.000000000 +0000
@@ -52,6 +52,7 @@ function hosting_ssl_hosting_site_option
// Test if ssl has been enabled.
if ($node->ssl_enabled != 0) {
+
$keys = hosting_ssl_get_keys($node->client, TRUE);
// return the list of valid keys, including the special 'new key' option.
@@ -61,7 +62,6 @@ function hosting_ssl_hosting_site_option
if (sizeof($return['ssl_key']) == 1) {
$node->ssl_key = HOSTING_SSL_CUSTOM_KEY;
}
-
// the user has chosen to enter a new key
if ($node->ssl_key == HOSTING_SSL_CUSTOM_KEY) {
@@ -70,21 +70,11 @@ function hosting_ssl_hosting_site_option
$return['ssl_key_new'] = (!empty($default)) ? $default : true;
}
- // Only platforms that are SSL enabled can be chosen now.
- $ssl_servers = hosting_ssl_get_servers();
-
- // check all existing valid platforms and remove the ones we don't want.
- foreach ($return['platform'] as $key => $nid) {
- $platform = node_load($nid);
-
- if (!in_array($platform->web_server, $ssl_servers)) {
- // Remove the platform from the list because SSL is not available for it.
- unset($return['platform'][$key]);
- }
- }
// we need to ensure that the return value is properly indexed, otherwise it
// gets interpreted as an object by jquery.
- $return['platform'] = array_values($return['platform']);
+ $return['profile'] = array_values(array_intersect($return['profile'], hosting_ssl_get_profiles()));
+
+ $return['platform'] = array_values(array_intersect($return['platform'], hosting_ssl_get_platforms()));
}
}
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.service.inc /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.service.inc
--- /var/backups/8/2/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.service.inc 2010-07-18 14:04:04.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.service.inc 2010-07-20 00:43:37.000000000 +0000
@@ -90,13 +90,3 @@ class hostingService_http_apache_ssl ext
}
-class hostingService_http_nginx_ssl extends hostingService_http_ssl {
-
- public $type = 'nginx_ssl';
- protected $has_restart_cmd = TRUE;
-
- function default_restart_cmd() {
- return "sudo /etc/init.d/nginx reload";
- }
-
-}
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/sites/v185.barracuda.us.host8.biz/drushrc.php /var/aegir/hostmaster-HEAD/sites/v185.barracuda.us.host8.biz/drushrc.php
--- /var/backups/8/2/aegir/hostmaster-HEAD/sites/v185.barracuda.us.host8.biz/drushrc.php 2010-07-18 14:30:03.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/sites/v185.barracuda.us.host8.biz/drushrc.php 2010-07-20 00:44:02.000000000 +0000
@@ -4,10 +4,12 @@
$options['db_type'] = 'mysqli';
$options['db_host'] = 'v185.barracuda.us.host8.biz';
$options['db_port'] = 3306;
-$options['db_passwd'] = '***';
-$options['db_name'] = 'v185barracuda_20';
-$options['db_user'] = 'v185barracuda_20';
+$options['db_passwd'] = '***';
+$options['db_name'] = 'v185barracuda_35';
+$options['db_user'] = 'v185barracuda_35';
$options['installed'] = true;
+$options['site_ip_addresses'] = array (
+);
$options['packages'] = array (
'platforms' =>
array (
@@ -689,6 +691,34 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
+ 'update' =>
+ array (
+ 'filename' => '/var/aegir/hostmaster-HEAD/modules/update/update.module',
+ 'name' => 'update',
+ 'type' => 'module',
+ 'owner' => '',
+ 'status' => '0',
+ 'throttle' => '0',
+ 'bootstrap' => '0',
+ 'schema_version' => 0,
+ 'weight' => '0',
+ 'info' =>
+ array (
+ 'name' => 'Update status',
+ 'description' => 'Checks the status of available updates for Drupal and your installed modules and themes.',
+ 'version' => '6.17',
+ 'package' => 'Core - optional',
+ 'core' => '6.x',
+ 'project' => 'drupal',
+ 'datestamp' => '1275505216',
+ 'dependencies' =>
+ array (
+ ),
+ 'php' => '4.3.5',
+ ),
+ 'project' => 'drupal',
+ 'version' => '6.17',
+ ),
'upload' =>
array (
'filename' => '/var/aegir/hostmaster-HEAD/modules/upload/upload.module',
@@ -1160,34 +1190,6 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'update' =>
- array (
- 'filename' => '/var/aegir/hostmaster-HEAD/modules/update/update.module',
- 'name' => 'update',
- 'type' => 'module',
- 'owner' => '',
- 'status' => '1',
- 'throttle' => '0',
- 'bootstrap' => '0',
- 'schema_version' => '6000',
- 'weight' => '0',
- 'info' =>
- array (
- 'name' => 'Update status',
- 'description' => 'Checks the status of available updates for Drupal and your installed modules and themes.',
- 'version' => '6.17',
- 'package' => 'Core - optional',
- 'core' => '6.x',
- 'project' => 'drupal',
- 'datestamp' => '1275505216',
- 'dependencies' =>
- array (
- ),
- 'php' => '4.3.5',
- ),
- 'project' => 'drupal',
- 'version' => '6.17',
- ),
'user' =>
array (
'filename' => '/var/aegir/hostmaster-HEAD/modules/user/user.module',
@@ -1488,6 +1490,35 @@ $options['packages'] = array (
'project' => '',
'version' => NULL,
),
+ 'hosting_nginx_ssl' =>
+ array (
+ 'filename' => '/var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/nginx/ssl/hosting_nginx_ssl.module',
+ 'name' => 'hosting_nginx_ssl',
+ 'type' => 'module',
+ 'owner' => '',
+ 'status' => '1',
+ 'throttle' => '0',
+ 'bootstrap' => '0',
+ 'schema_version' => '0',
+ 'weight' => '0',
+ 'info' =>
+ array (
+ 'name' => 'Nginx +SSL servers',
+ 'description' => 'Allow hostmaster to configure NGINX web servers with SSL support.',
+ 'package' => 'Hosting',
+ 'dependencies' =>
+ array (
+ 0 => 'hosting_web_server',
+ 1 => 'hosting_ssl',
+ 2 => 'hosting_nginx',
+ ),
+ 'core' => '6.x',
+ 'version' => NULL,
+ 'php' => '4.3.5',
+ ),
+ 'project' => '',
+ 'version' => NULL,
+ ),
'hosting_ssl' =>
array (
'filename' => '/var/aegir/hostmaster-HEAD/profiles/hostmaster/modules/hosting/web_server/ssl/hosting_ssl.module',
@@ -1640,46 +1671,6 @@ $options['packages'] = array (
),
'themes' =>
array (
- 'eldir' =>
- array (
- 'filename' => '/var/aegir/hostmaster-HEAD/profiles/hostmaster/themes/eldir/eldir.info',
- 'name' => 'eldir',
- 'type' => 'theme',
- 'owner' => 'themes/engines/phptemplate/phptemplate.engine',
- 'status' => '0',
- 'throttle' => '0',
- 'bootstrap' => '0',
- 'schema_version' => 0,
- 'weight' => '0',
- 'info' =>
- array (
- 'name' => 'Eldir',
- 'description' => 'Companion theme for the Aegir hosting system.',
- 'version' => '6.17',
- 'core' => '6.x',
- 'engine' => 'phptemplate',
- 'stylesheets' =>
- array (
- 'all' =>
- array (
- 0 => 'style.css',
- ),
- ),
- 'regions' =>
- array (
- 'left' => 'Left sidebar',
- 'right' => 'Right sidebar',
- 'content' => 'Content',
- 'header' => 'Header',
- ),
- 'dependencies' =>
- array (
- ),
- 'php' => '4.3.5',
- ),
- 'project' => '',
- 'version' => '6.17',
- ),
'bluemarine' =>
array (
'filename' => '/var/aegir/hostmaster-HEAD/themes/bluemarine/bluemarine.info',
@@ -1755,12 +1746,12 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'marvin' =>
+ 'eldir' =>
array (
- 'filename' => '/var/aegir/hostmaster-HEAD/themes/chameleon/marvin/marvin.info',
- 'name' => 'marvin',
+ 'filename' => '/var/aegir/hostmaster-HEAD/profiles/hostmaster/themes/eldir/eldir.info',
+ 'name' => 'eldir',
'type' => 'theme',
- 'owner' => '',
+ 'owner' => 'themes/engines/phptemplate/phptemplate.engine',
'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
@@ -1768,24 +1759,31 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Marvin',
- 'description' => 'Boxy tabled theme in all grays.',
+ 'name' => 'Eldir',
+ 'description' => 'Companion theme for the Aegir hosting system.',
+ 'version' => '6.17',
+ 'core' => '6.x',
+ 'engine' => 'phptemplate',
+ 'stylesheets' =>
+ array (
+ 'all' =>
+ array (
+ 0 => 'style.css',
+ ),
+ ),
'regions' =>
array (
'left' => 'Left sidebar',
'right' => 'Right sidebar',
+ 'content' => 'Content',
+ 'header' => 'Header',
),
- 'version' => '6.17',
- 'core' => '6.x',
- 'base theme' => 'chameleon',
- 'project' => 'drupal',
- 'datestamp' => '1275505216',
'dependencies' =>
array (
),
'php' => '4.3.5',
),
- 'project' => 'drupal',
+ 'project' => '',
'version' => '6.17',
),
'garland' =>
@@ -1827,6 +1825,39 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
+ 'marvin' =>
+ array (
+ 'filename' => '/var/aegir/hostmaster-HEAD/themes/chameleon/marvin/marvin.info',
+ 'name' => 'marvin',
+ 'type' => 'theme',
+ 'owner' => '',
+ 'status' => '0',
+ 'throttle' => '0',
+ 'bootstrap' => '0',
+ 'schema_version' => 0,
+ 'weight' => '0',
+ 'info' =>
+ array (
+ 'name' => 'Marvin',
+ 'description' => 'Boxy tabled theme in all grays.',
+ 'regions' =>
+ array (
+ 'left' => 'Left sidebar',
+ 'right' => 'Right sidebar',
+ ),
+ 'version' => '6.17',
+ 'core' => '6.x',
+ 'base theme' => 'chameleon',
+ 'project' => 'drupal',
+ 'datestamp' => '1275505216',
+ 'dependencies' =>
+ array (
+ ),
+ 'php' => '4.3.5',
+ ),
+ 'project' => 'drupal',
+ 'version' => '6.17',
+ ),
'minnelli' =>
array (
'filename' => '/var/aegir/hostmaster-HEAD/themes/garland/minnelli/minnelli.info',
diff -urp /var/backups/8/2/aegir/hostmaster-HEAD/sites/v185.barracuda.us.host8.biz/settings.php /var/aegir/hostmaster-HEAD/sites/v185.barracuda.us.host8.biz/settings.php
--- /var/backups/8/2/aegir/hostmaster-HEAD/sites/v185.barracuda.us.host8.biz/settings.php 2010-07-18 14:30:02.000000000 +0000
+++ /var/aegir/hostmaster-HEAD/sites/v185.barracuda.us.host8.biz/settings.php 2010-07-20 00:44:02.000000000 +0000
@@ -9,12 +9,12 @@
*/
$databases['default']['default'] = array(
'driver' => "mysqli",
- 'database' => "v185barracuda_20",
- 'username' => "v185barracuda_20",
- 'password' => "***",
+ 'database' => "v185barracuda_35",
+ 'username' => "v185barracuda_35",
+ 'password' => "***",
'host' => v185.barracuda.us.host8.biz,
);
- $db_url = "mysqli://v185barracuda_20:***@v185.barracuda.us.host8.biz/v185barracuda_20";
+ $db_url = "mysqli://v185barracuda_35:***@v185.barracuda.us.host8.biz/v185barracuda_35";
$profile = "hostmaster";
Only in /var/aegir/platforms/drupal-6.17/sites: blah.v185.barracuda.us.host8.biz
diff -urp /var/backups/8/2/aegir/platforms/drupal-6.17/sites/ssl.v185.barracuda.us.host8.biz/drushrc.php /var/aegir/platforms/drupal-6.17/sites/ssl.v185.barracuda.us.host8.biz/drushrc.php
--- /var/backups/8/2/aegir/platforms/drupal-6.17/sites/ssl.v185.barracuda.us.host8.biz/drushrc.php 2010-07-18 13:57:03.000000000 +0000
+++ /var/aegir/platforms/drupal-6.17/sites/ssl.v185.barracuda.us.host8.biz/drushrc.php 2010-07-19 18:53:03.000000000 +0000
@@ -69,6 +69,34 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
+ 'block' =>
+ array (
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/block/block.module',
+ 'name' => 'block',
+ 'type' => 'module',
+ 'owner' => '',
+ 'status' => '1',
+ 'throttle' => '0',
+ 'bootstrap' => '0',
+ 'schema_version' => '0',
+ 'weight' => '0',
+ 'info' =>
+ array (
+ 'name' => 'Block',
+ 'description' => 'Controls the boxes that are displayed around the main content.',
+ 'package' => 'Core - required',
+ 'version' => '6.17',
+ 'core' => '6.x',
+ 'project' => 'drupal',
+ 'datestamp' => '1275505216',
+ 'dependencies' =>
+ array (
+ ),
+ 'php' => '4.3.5',
+ ),
+ 'project' => 'drupal',
+ 'version' => '6.17',
+ ),
'blog' =>
array (
'filename' => '/var/aegir/platforms/drupal-6.17/modules/blog/blog.module',
@@ -153,21 +181,21 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'contact' =>
+ 'color' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/contact/contact.module',
- 'name' => 'contact',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/color/color.module',
+ 'name' => 'color',
'type' => 'module',
'owner' => '',
- 'status' => '0',
+ 'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => 0,
+ 'schema_version' => '0',
'weight' => '0',
'info' =>
array (
- 'name' => 'Contact',
- 'description' => 'Enables the use of both personal and site-wide contact forms.',
+ 'name' => 'Color',
+ 'description' => 'Allows the user to change the color scheme of certain themes.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -181,40 +209,38 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'forum' =>
+ 'comment' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/forum/forum.module',
- 'name' => 'forum',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/comment/comment.module',
+ 'name' => 'comment',
'type' => 'module',
'owner' => '',
- 'status' => '0',
+ 'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => 0,
+ 'schema_version' => '6003',
'weight' => '0',
'info' =>
array (
- 'name' => 'Forum',
- 'description' => 'Enables threaded discussions about general topics.',
- 'dependencies' =>
- array (
- 0 => 'taxonomy',
- 1 => 'comment',
- ),
+ 'name' => 'Comment',
+ 'description' => 'Allows users to comment on and discuss published content.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
+ 'dependencies' =>
+ array (
+ ),
'php' => '4.3.5',
),
'project' => 'drupal',
'version' => '6.17',
),
- 'locale' =>
+ 'contact' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/locale/locale.module',
- 'name' => 'locale',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/contact/contact.module',
+ 'name' => 'contact',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -224,8 +250,8 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Locale',
- 'description' => 'Adds language handling functionality and enables the translation of the user interface to languages other than English.',
+ 'name' => 'Contact',
+ 'description' => 'Enables the use of both personal and site-wide contact forms.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -239,23 +265,23 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'openid' =>
+ 'dblog' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/openid/openid.module',
- 'name' => 'openid',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/dblog/dblog.module',
+ 'name' => 'dblog',
'type' => 'module',
'owner' => '',
- 'status' => '0',
+ 'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => 0,
+ 'schema_version' => '6000',
'weight' => '0',
'info' =>
array (
- 'name' => 'OpenID',
- 'description' => 'Allows users to log into your site using OpenID.',
- 'version' => '6.17',
+ 'name' => 'Database logging',
+ 'description' => 'Logs and records system events to the database.',
'package' => 'Core - optional',
+ 'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
@@ -267,22 +293,22 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'path' =>
+ 'filter' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/path/path.module',
- 'name' => 'path',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/filter/filter.module',
+ 'name' => 'filter',
'type' => 'module',
'owner' => '',
- 'status' => '0',
+ 'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => 0,
+ 'schema_version' => '0',
'weight' => '0',
'info' =>
array (
- 'name' => 'Path',
- 'description' => 'Allows users to rename URLs.',
- 'package' => 'Core - optional',
+ 'name' => 'Filter',
+ 'description' => 'Handles the filtering of content in preparation for display.',
+ 'package' => 'Core - required',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
@@ -295,10 +321,10 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'php' =>
+ 'forum' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/php/php.module',
- 'name' => 'php',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/forum/forum.module',
+ 'name' => 'forum',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -308,36 +334,38 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'PHP filter',
- 'description' => 'Allows embedded PHP code/snippets to be evaluated.',
+ 'name' => 'Forum',
+ 'description' => 'Enables threaded discussions about general topics.',
+ 'dependencies' =>
+ array (
+ 0 => 'taxonomy',
+ 1 => 'comment',
+ ),
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
- 'dependencies' =>
- array (
- ),
'php' => '4.3.5',
),
'project' => 'drupal',
'version' => '6.17',
),
- 'ping' =>
+ 'help' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/ping/ping.module',
- 'name' => 'ping',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/help/help.module',
+ 'name' => 'help',
'type' => 'module',
'owner' => '',
- 'status' => '0',
+ 'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => 0,
+ 'schema_version' => '0',
'weight' => '0',
'info' =>
array (
- 'name' => 'Ping',
- 'description' => 'Alerts other sites when your site has been updated.',
+ 'name' => 'Help',
+ 'description' => 'Manages the display of online help.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -351,10 +379,10 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'poll' =>
+ 'locale' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/poll/poll.module',
- 'name' => 'poll',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/locale/locale.module',
+ 'name' => 'locale',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -364,8 +392,8 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Poll',
- 'description' => 'Allows your site to capture votes on different topics in the form of multiple choice questions.',
+ 'name' => 'Locale',
+ 'description' => 'Adds language handling functionality and enables the translation of the user interface to languages other than English.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -379,21 +407,21 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'profile' =>
+ 'menu' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/profile/profile.module',
- 'name' => 'profile',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/menu/menu.module',
+ 'name' => 'menu',
'type' => 'module',
'owner' => '',
- 'status' => '0',
+ 'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => 0,
+ 'schema_version' => '0',
'weight' => '0',
'info' =>
array (
- 'name' => 'Profile',
- 'description' => 'Supports configurable user profiles.',
+ 'name' => 'Menu',
+ 'description' => 'Allows administrators to customize the site navigation menu.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -407,22 +435,22 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'search' =>
+ 'node' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/search/search.module',
- 'name' => 'search',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/node/node.module',
+ 'name' => 'node',
'type' => 'module',
'owner' => '',
- 'status' => '0',
+ 'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => 0,
+ 'schema_version' => '0',
'weight' => '0',
'info' =>
array (
- 'name' => 'Search',
- 'description' => 'Enables site-wide keyword searching.',
- 'package' => 'Core - optional',
+ 'name' => 'Node',
+ 'description' => 'Allows content to be submitted to the site and displayed on pages.',
+ 'package' => 'Core - required',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
@@ -435,10 +463,10 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'statistics' =>
+ 'openid' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/statistics/statistics.module',
- 'name' => 'statistics',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/openid/openid.module',
+ 'name' => 'openid',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -448,10 +476,10 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Statistics',
- 'description' => 'Logs access statistics for your site.',
- 'package' => 'Core - optional',
+ 'name' => 'OpenID',
+ 'description' => 'Allows users to log into your site using OpenID.',
'version' => '6.17',
+ 'package' => 'Core - optional',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
@@ -463,10 +491,10 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'syslog' =>
+ 'path' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/syslog/syslog.module',
- 'name' => 'syslog',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/path/path.module',
+ 'name' => 'path',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -476,8 +504,8 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Syslog',
- 'description' => 'Logs and records system events to syslog.',
+ 'name' => 'Path',
+ 'description' => 'Allows users to rename URLs.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -491,10 +519,10 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'throttle' =>
+ 'php' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/throttle/throttle.module',
- 'name' => 'throttle',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/php/php.module',
+ 'name' => 'php',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -504,8 +532,8 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Throttle',
- 'description' => 'Handles the auto-throttling mechanism, to control site congestion.',
+ 'name' => 'PHP filter',
+ 'description' => 'Allows embedded PHP code/snippets to be evaluated.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -519,10 +547,10 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'tracker' =>
+ 'ping' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/tracker/tracker.module',
- 'name' => 'tracker',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/ping/ping.module',
+ 'name' => 'ping',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -532,55 +560,25 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Tracker',
- 'description' => 'Enables tracking of recent posts for users.',
- 'dependencies' =>
- array (
- 0 => 'comment',
- ),
+ 'name' => 'Ping',
+ 'description' => 'Alerts other sites when your site has been updated.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
- 'php' => '4.3.5',
- ),
- 'project' => 'drupal',
- 'version' => '6.17',
- ),
- 'translation' =>
- array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/translation/translation.module',
- 'name' => 'translation',
- 'type' => 'module',
- 'owner' => '',
- 'status' => '0',
- 'throttle' => '0',
- 'bootstrap' => '0',
- 'schema_version' => 0,
- 'weight' => '0',
- 'info' =>
- array (
- 'name' => 'Content translation',
- 'description' => 'Allows content to be translated into different languages.',
'dependencies' =>
array (
- 0 => 'locale',
),
- 'package' => 'Core - optional',
- 'version' => '6.17',
- 'core' => '6.x',
- 'project' => 'drupal',
- 'datestamp' => '1275505216',
'php' => '4.3.5',
),
'project' => 'drupal',
'version' => '6.17',
),
- 'trigger' =>
+ 'poll' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/trigger/trigger.module',
- 'name' => 'trigger',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/poll/poll.module',
+ 'name' => 'poll',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -590,8 +588,8 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Trigger',
- 'description' => 'Enables actions to be fired on certain system events, such as when new content is created.',
+ 'name' => 'Poll',
+ 'description' => 'Allows your site to capture votes on different topics in the form of multiple choice questions.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -605,10 +603,10 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'update' =>
+ 'profile' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/update/update.module',
- 'name' => 'update',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/profile/profile.module',
+ 'name' => 'profile',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -618,10 +616,10 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Update status',
- 'description' => 'Checks the status of available updates for Drupal and your installed modules and themes.',
- 'version' => '6.17',
+ 'name' => 'Profile',
+ 'description' => 'Supports configurable user profiles.',
'package' => 'Core - optional',
+ 'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
@@ -633,10 +631,10 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'upload' =>
+ 'search' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/upload/upload.module',
- 'name' => 'upload',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/search/search.module',
+ 'name' => 'search',
'type' => 'module',
'owner' => '',
'status' => '0',
@@ -646,8 +644,8 @@ $options['packages'] = array (
'weight' => '0',
'info' =>
array (
- 'name' => 'Upload',
- 'description' => 'Allows users to upload and attach files to content.',
+ 'name' => 'Search',
+ 'description' => 'Enables site-wide keyword searching.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -661,22 +659,22 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'block' =>
+ 'statistics' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/block/block.module',
- 'name' => 'block',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/statistics/statistics.module',
+ 'name' => 'statistics',
'type' => 'module',
'owner' => '',
- 'status' => '1',
+ 'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '0',
+ 'schema_version' => 0,
'weight' => '0',
'info' =>
array (
- 'name' => 'Block',
- 'description' => 'Controls the boxes that are displayed around the main content.',
- 'package' => 'Core - required',
+ 'name' => 'Statistics',
+ 'description' => 'Logs access statistics for your site.',
+ 'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
@@ -689,21 +687,21 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'color' =>
+ 'syslog' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/color/color.module',
- 'name' => 'color',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/syslog/syslog.module',
+ 'name' => 'syslog',
'type' => 'module',
'owner' => '',
- 'status' => '1',
+ 'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '0',
+ 'schema_version' => 0,
'weight' => '0',
'info' =>
array (
- 'name' => 'Color',
- 'description' => 'Allows the user to change the color scheme of certain themes.',
+ 'name' => 'Syslog',
+ 'description' => 'Logs and records system events to syslog.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -717,22 +715,22 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'comment' =>
+ 'system' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/comment/comment.module',
- 'name' => 'comment',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/system/system.module',
+ 'name' => 'system',
'type' => 'module',
'owner' => '',
'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '6003',
+ 'schema_version' => '6055',
'weight' => '0',
'info' =>
array (
- 'name' => 'Comment',
- 'description' => 'Allows users to comment on and discuss published content.',
- 'package' => 'Core - optional',
+ 'name' => 'System',
+ 'description' => 'Handles general site configuration for administrators.',
+ 'package' => 'Core - required',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
@@ -745,21 +743,21 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'dblog' =>
+ 'taxonomy' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/dblog/dblog.module',
- 'name' => 'dblog',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/taxonomy/taxonomy.module',
+ 'name' => 'taxonomy',
'type' => 'module',
'owner' => '',
'status' => '1',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '6000',
+ 'schema_version' => '0',
'weight' => '0',
'info' =>
array (
- 'name' => 'Database logging',
- 'description' => 'Logs and records system events to the database.',
+ 'name' => 'Taxonomy',
+ 'description' => 'Enables the categorization of content.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
@@ -773,22 +771,22 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'filter' =>
+ 'throttle' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/filter/filter.module',
- 'name' => 'filter',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/throttle/throttle.module',
+ 'name' => 'throttle',
'type' => 'module',
'owner' => '',
- 'status' => '1',
+ 'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '0',
+ 'schema_version' => 0,
'weight' => '0',
'info' =>
array (
- 'name' => 'Filter',
- 'description' => 'Handles the filtering of content in preparation for display.',
- 'package' => 'Core - required',
+ 'name' => 'Throttle',
+ 'description' => 'Handles the auto-throttling mechanism, to control site congestion.',
+ 'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
@@ -801,78 +799,80 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'help' =>
+ 'tracker' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/help/help.module',
- 'name' => 'help',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/tracker/tracker.module',
+ 'name' => 'tracker',
'type' => 'module',
'owner' => '',
- 'status' => '1',
+ 'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '0',
+ 'schema_version' => 0,
'weight' => '0',
'info' =>
array (
- 'name' => 'Help',
- 'description' => 'Manages the display of online help.',
+ 'name' => 'Tracker',
+ 'description' => 'Enables tracking of recent posts for users.',
+ 'dependencies' =>
+ array (
+ 0 => 'comment',
+ ),
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
- 'dependencies' =>
- array (
- ),
'php' => '4.3.5',
),
'project' => 'drupal',
'version' => '6.17',
),
- 'menu' =>
+ 'translation' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/menu/menu.module',
- 'name' => 'menu',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/translation/translation.module',
+ 'name' => 'translation',
'type' => 'module',
'owner' => '',
- 'status' => '1',
+ 'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '0',
+ 'schema_version' => 0,
'weight' => '0',
'info' =>
array (
- 'name' => 'Menu',
- 'description' => 'Allows administrators to customize the site navigation menu.',
+ 'name' => 'Content translation',
+ 'description' => 'Allows content to be translated into different languages.',
+ 'dependencies' =>
+ array (
+ 0 => 'locale',
+ ),
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
- 'dependencies' =>
- array (
- ),
'php' => '4.3.5',
),
'project' => 'drupal',
'version' => '6.17',
),
- 'node' =>
+ 'trigger' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/node/node.module',
- 'name' => 'node',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/trigger/trigger.module',
+ 'name' => 'trigger',
'type' => 'module',
'owner' => '',
- 'status' => '1',
+ 'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '0',
+ 'schema_version' => 0,
'weight' => '0',
'info' =>
array (
- 'name' => 'Node',
- 'description' => 'Allows content to be submitted to the site and displayed on pages.',
- 'package' => 'Core - required',
+ 'name' => 'Trigger',
+ 'description' => 'Enables actions to be fired on certain system events, such as when new content is created.',
+ 'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
'project' => 'drupal',
@@ -885,23 +885,23 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'system' =>
+ 'update' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/system/system.module',
- 'name' => 'system',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/update/update.module',
+ 'name' => 'update',
'type' => 'module',
'owner' => '',
- 'status' => '1',
+ 'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '6055',
+ 'schema_version' => 0,
'weight' => '0',
'info' =>
array (
- 'name' => 'System',
- 'description' => 'Handles general site configuration for administrators.',
- 'package' => 'Core - required',
+ 'name' => 'Update status',
+ 'description' => 'Checks the status of available updates for Drupal and your installed modules and themes.',
'version' => '6.17',
+ 'package' => 'Core - optional',
'core' => '6.x',
'project' => 'drupal',
'datestamp' => '1275505216',
@@ -913,21 +913,21 @@ $options['packages'] = array (
'project' => 'drupal',
'version' => '6.17',
),
- 'taxonomy' =>
+ 'upload' =>
array (
- 'filename' => '/var/aegir/platforms/drupal-6.17/modules/taxonomy/taxonomy.module',
- 'name' => 'taxonomy',
+ 'filename' => '/var/aegir/platforms/drupal-6.17/modules/upload/upload.module',
+ 'name' => 'upload',
'type' => 'module',
'owner' => '',
- 'status' => '1',
+ 'status' => '0',
'throttle' => '0',
'bootstrap' => '0',
- 'schema_version' => '0',
+ 'schema_version' => 0,
'weight' => '0',
'info' =>
array (
- 'name' => 'Taxonomy',
- 'description' => 'Enables the categorization of content.',
+ 'name' => 'Upload',
+ 'description' => 'Allows users to upload and attach files to content.',
'package' => 'Core - optional',
'version' => '6.17',
'core' => '6.x',
Only in /var/backups/8/2/aegir: .rnd
Only in /var/backups/8/2/aegir: wtf.diff.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment