From 21df4a279672ecfc061d647fe02aa4dcb198a10b Mon Sep 17 00:00:00 2001 From: James Meyer Date: Tue, 11 Nov 2008 14:52:37 -0600 Subject: move mysql ,lighttpd docroot to /data/srv This makes housekeeping much easier --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/install_db_chroot.sh | 4 ++-- abs/core-testing/LinHES-config/restore_km_db_chroot.sh | 4 ++-- abs/core-testing/lighttpd/PKGBUILD | 2 +- abs/core-testing/lighttpd/lighttpd.conf | 2 +- abs/core-testing/local-website/PKGBUILD | 10 +++++----- abs/core-testing/mysql/PKGBUILD | 2 +- abs/core-testing/mysql/my.cnf | 2 +- abs/core-testing/mysql/mysqld.conf.d | 2 +- abs/core-testing/mythtv/stable/mythweb/PKGBUILD | 4 ++-- abs/mv-core/mysql/PKGBUILD | 2 +- abs/mv-core/mysql/mysqld.conf.d | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index ebb9a5b..2e8ced9 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=4 +pkgrel=5 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan) diff --git a/abs/core-testing/LinHES-config/install_db_chroot.sh b/abs/core-testing/LinHES-config/install_db_chroot.sh index 514dd3c..1ec8cec 100755 --- a/abs/core-testing/LinHES-config/install_db_chroot.sh +++ b/abs/core-testing/LinHES-config/install_db_chroot.sh @@ -35,8 +35,8 @@ do #update database to allow user jobs on this host. $MV_ROOT/bin/restore_default_settings.sh -c USERJOBALLOW $MV_ROOT/bin/restore_default_settings.sh -c ACCESSCONTROL - #if [ -d /data/srv/mysql/mythconverg ] - if [ -d /var/lib/mysql/mythconverg ] + if [ -d /data/srv/mysql/mythconverg ] + #if [ -d /var/lib/mysql/mythconverg ] then # pacman --noconfirm -R webcalendar # pacman --noconfirm --nodeps -S webcalendar diff --git a/abs/core-testing/LinHES-config/restore_km_db_chroot.sh b/abs/core-testing/LinHES-config/restore_km_db_chroot.sh index 9467ffd..35e8fbd 100644 --- a/abs/core-testing/LinHES-config/restore_km_db_chroot.sh +++ b/abs/core-testing/LinHES-config/restore_km_db_chroot.sh @@ -33,8 +33,8 @@ if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] gunzip -c /myth/backup/mythconverg.sql.gz > /myth/backup/mythconverg.sql mysql mythconverg < /myth/backup/mythconverg.sql - - if [ -d /var/lib/mysql/mythconverg ] + if [ -d /data/srv/mysql/mythconverg ] + #if [ -d /var/lib/mysql/mythconverg ] then status=0 fi diff --git a/abs/core-testing/lighttpd/PKGBUILD b/abs/core-testing/lighttpd/PKGBUILD index ab5eadc..0b42db7 100644 --- a/abs/core-testing/lighttpd/PKGBUILD +++ b/abs/core-testing/lighttpd/PKGBUILD @@ -1,6 +1,6 @@ pkgname=lighttpd pkgver=1.4.20 -pkgrel=5 +pkgrel=6 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') diff --git a/abs/core-testing/lighttpd/lighttpd.conf b/abs/core-testing/lighttpd/lighttpd.conf index df5990b..efcd219 100644 --- a/abs/core-testing/lighttpd/lighttpd.conf +++ b/abs/core-testing/lighttpd/lighttpd.conf @@ -37,7 +37,7 @@ server.modules = ( ## a static document-root, for virtual-hosting take look at the ## server.virtual-* options -server.document-root = "/srv/http/" +server.document-root = "/data/srv/httpd/htdocs" ## where to send error-messages to server.errorlog = "/var/log/lighttpd/error.log" diff --git a/abs/core-testing/local-website/PKGBUILD b/abs/core-testing/local-website/PKGBUILD index 7c9b759..232d18d 100644 --- a/abs/core-testing/local-website/PKGBUILD +++ b/abs/core-testing/local-website/PKGBUILD @@ -1,6 +1,6 @@ pkgname=local-website pkgver=2 -pkgrel=4 +pkgrel=5 pkgdesc="Contents of http://localhost" arch=(i686 x86_64) license=('GPL') @@ -12,10 +12,10 @@ source=() build() { cd $startdir/pkg - mkdir -p srv/http - cp -rp $startdir/htdocs/* $startdir/pkg/srv/http - chown -R http:users $startdir/pkg/srv/http - chmod -R 755 $startdir/pkg/srv/http + mkdir -p data/srv/httpd/htdocs + cp -rp $startdir/htdocs/* $startdir/pkg/data/srv/httpd/htdocs + chown -R http:users $startdir/pkg/data/srv/httpd + chmod -R 755 $startdir/pkg/data/srv/httpd } diff --git a/abs/core-testing/mysql/PKGBUILD b/abs/core-testing/mysql/PKGBUILD index f5575b4..87f8528 100644 --- a/abs/core-testing/mysql/PKGBUILD +++ b/abs/core-testing/mysql/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: judd pkgname=mysql pkgver=5.0.60 -pkgrel=4 +pkgrel=5 pkgdesc="A fast SQL database server" arch=(i686 x86_64) backup=(etc/my.cnf etc/conf.d/mysqld) diff --git a/abs/core-testing/mysql/my.cnf b/abs/core-testing/mysql/my.cnf index 1da2acf..7202fcd 100644 --- a/abs/core-testing/mysql/my.cnf +++ b/abs/core-testing/mysql/my.cnf @@ -20,7 +20,7 @@ socket = /tmp/mysql.sock [mysqld] port = 3306 socket = /tmp/mysql.sock -datadir = /var/lib/mysql +datadir = /data/srv/mysql skip-locking key_buffer = 16M max_allowed_packet = 1M diff --git a/abs/core-testing/mysql/mysqld.conf.d b/abs/core-testing/mysql/mysqld.conf.d index 04752b1..10b7098 100644 --- a/abs/core-testing/mysql/mysqld.conf.d +++ b/abs/core-testing/mysql/mysqld.conf.d @@ -1 +1 @@ -MYSQLD_ROOT="/var/lib/mysql" +MYSQLD_ROOT="/data/srv/mysql" diff --git a/abs/core-testing/mythtv/stable/mythweb/PKGBUILD b/abs/core-testing/mythtv/stable/mythweb/PKGBUILD index 9b54d6d..6474b01 100644 --- a/abs/core-testing/mythtv/stable/mythweb/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.21 -pkgrel=7 +pkgrel=8 pkgdesc="Web interface for MythTV's backend" arch=('i686' 'x86_64') url="http://www.mythtv.org" @@ -10,7 +10,7 @@ install=mythweb.install source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2") md5sums=('af20a78ac66719feddf9a39f1a799ded') groups=('mythtv-extras') -DOCROOT=srv/http/mythweb +DOCROOT=/data/srv/httpd/htdocs/mythweb build() { mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions} diff --git a/abs/mv-core/mysql/PKGBUILD b/abs/mv-core/mysql/PKGBUILD index 79ec522..eac4347 100644 --- a/abs/mv-core/mysql/PKGBUILD +++ b/abs/mv-core/mysql/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mysql pkgver=5.0.60 -pkgrel=1000 +pkgrel=1001 pkgdesc="A fast SQL database server" arch=(i686 x86_64) backup=(etc/my.cnf etc/conf.d/mysqld) diff --git a/abs/mv-core/mysql/mysqld.conf.d b/abs/mv-core/mysql/mysqld.conf.d index 04752b1..10b7098 100644 --- a/abs/mv-core/mysql/mysqld.conf.d +++ b/abs/mv-core/mysql/mysqld.conf.d @@ -1 +1 @@ -MYSQLD_ROOT="/var/lib/mysql" +MYSQLD_ROOT="/data/srv/mysql" -- cgit v0.12