/[gentoo-x86]/eclass/webapp.eclass
Gentoo

Diff of /eclass/webapp.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.35 Revision 1.47
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.35 2005/07/14 15:38:16 dju Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.47 2006/12/31 19:16:31 rl03 Exp $
4# 4#
5# eclass/webapp.eclass 5# eclass/webapp.eclass
6# Eclass for installing applications to run under a web server 6# Eclass for installing applications to run under a web server
7# 7#
8# Part of the implementation of GLEP #11 8# Part of the implementation of GLEP #11
9# 9#
10# Author(s) Stuart Herbert <stuart@gentoo.org> 10# Author(s) Stuart Herbert
11# Renat Lumpau <rl03@gentoo.org>
12# Gunnar Wrobel <wrobel@gentoo.org>
11# 13#
12# ------------------------------------------------------------------------ 14# ------------------------------------------------------------------------
13# 15#
14# The master copy of this eclass is held in Stu's subversion repository. 16# The master copy of this eclass is held in our subversion repository.
17# http://svn.gnqs.org/projects/vhost-tools/browser/
15# 18#
16# If you make changes to this file and don't tell Stu, chances are that 19# If you make changes to this file and don't tell us, chances are that
17# your changes will be overwritten the next time Stu releases a new version 20# your changes will be overwritten the next time we release a new version
18# of webapp-config. 21# of webapp-config.
19# 22#
20# ------------------------------------------------------------------------ 23# ------------------------------------------------------------------------
21 24
22SLOT="${PVR}" 25SLOT="${PVR}"
23IUSE="$IUSE vhosts" 26IUSE="vhosts"
24DEPEND="$DEPEND net-www/webapp-config app-portage/gentoolkit" 27DEPEND=">=app-admin/webapp-config-1.50.15"
28RDEPEND="${DEPEND}"
25 29
26EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm 30EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm
27 31
28INSTALL_DIR="/$PN" 32INSTALL_DIR="/${PN}"
29IS_UPGRADE=0 33IS_UPGRADE=0
30IS_REPLACE=0 34IS_REPLACE=0
31 35
32INSTALL_CHECK_FILE="installed_by_webapp_eclass" 36INSTALL_CHECK_FILE="installed_by_webapp_eclass"
33 37
34ETC_CONFIG="/etc/vhosts/webapp-config" 38ETC_CONFIG="${ROOT}/etc/vhosts/webapp-config"
39WEBAPP_CONFIG="${ROOT}/usr/sbin/webapp-config"
40WEBAPP_CLEANER="${ROOT}/usr/sbin/webapp-cleaner"
41
42# ------------------------------------------------------------------------
43# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
44#
45# Load the config file /etc/vhosts/webapp-config
46#
47# Supports both the old bash version, and the new python version
48#
49# ------------------------------------------------------------------------
50
51function webapp_read_config ()
52{
53 if has_version '>=app-admin/webapp-config-1.50'; then
54 ENVVAR=$(${WEBAPP_CONFIG} --query ${PN} ${PVR}) || die "Could not read settings from webapp-config!"
55 eval ${ENVVAR}
56 else
57 . ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}"
58 fi
59}
35 60
36# ------------------------------------------------------------------------ 61# ------------------------------------------------------------------------
37# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY 62# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
38# 63#
39# Check whether a specified file exists within the image/ directory 64# Check whether a specified file exists within the image/ directory
46 71
47function webapp_checkfileexists () 72function webapp_checkfileexists ()
48{ 73{
49 local my_prefix 74 local my_prefix
50 75
51 [ -n "$2" ] && my_prefix="$2/" || my_prefix= 76 [ -n "${2}" ] && my_prefix="${2}/" || my_prefix=
52 77
53 if [ ! -e "${my_prefix}$1" ]; then 78 if [ ! -e "${my_prefix}${1}" ]; then
54 msg="ebuild fault: file '$1' not found" 79 msg="ebuild fault: file '${1}' not found"
55 eerror "$msg" 80 eerror "$msg"
56 eerror "Please report this as a bug at http://bugs.gentoo.org/" 81 eerror "Please report this as a bug at http://bugs.gentoo.org/"
57 die "$msg" 82 die "$msg"
58 fi 83 fi
59} 84}
64 89
65function webapp_check_installedat 90function webapp_check_installedat
66{ 91{
67 local my_output 92 local my_output
68 93
69 /usr/sbin/webapp-config --show-installed -h localhost -d "$INSTALL_DIR" 2> /dev/null 94 ${WEBAPP_CONFIG} --show-installed -h localhost -d "${INSTALL_DIR}" 2> /dev/null
70} 95}
71 96
72# ------------------------------------------------------------------------ 97# ------------------------------------------------------------------------
73# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY 98# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
74# ------------------------------------------------------------------------
75
76function webapp_import_config ()
77{
78 if [ -z "${MY_HTDOCSDIR}" ]; then
79 . /etc/conf.d/webapp-config
80 fi
81
82 if [ -z "${MY_HTDOCSDIR}" ]; then
83 libsh_edie "/etc/conf.d/webapp-config not imported"
84 fi
85}
86
87# ------------------------------------------------------------------------
88# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
89# 99#
90# ------------------------------------------------------------------------ 100# ------------------------------------------------------------------------
91 101
92function webapp_strip_appdir () 102function webapp_strip_appdir ()
93{ 103{
94 local my_stripped="$1" 104 local my_stripped="${1}"
95 echo "$1" | sed -e "s|${MY_APPDIR}/||g;" 105 echo "${1}" | sed -e "s|${MY_APPDIR}/||g;"
96} 106}
97 107
98function webapp_strip_d () 108function webapp_strip_d ()
99{ 109{
100 echo "$1" | sed -e "s|${D}||g;" 110 echo "${1}" | sed -e "s|${D}||g;"
101} 111}
102 112
103function webapp_strip_cwd () 113function webapp_strip_cwd ()
104{ 114{
105 local my_stripped="$1" 115 local my_stripped="${1}"
106 echo "$1" | sed -e 's|/./|/|g;' 116 echo "${1}" | sed -e 's|/./|/|g;'
107} 117}
108 118
109# ------------------------------------------------------------------------ 119# ------------------------------------------------------------------------
110# EXPORTED FUNCTION - FOR USE IN EBUILDS 120# EXPORTED FUNCTION - FOR USE IN EBUILDS
111# 121#
114# @param $1 - config file 124# @param $1 - config file
115# ------------------------------------------------------------------------ 125# ------------------------------------------------------------------------
116 126
117function webapp_configfile () 127function webapp_configfile ()
118{ 128{
129 local m=""
130 for m in "$@" ; do
119 webapp_checkfileexists "$1" "$D" 131 webapp_checkfileexists "${m}" "${D}"
120 132
121 local MY_FILE="`webapp_strip_appdir \"$1\"`" 133 local MY_FILE="$(webapp_strip_appdir "${m}")"
122 MY_FILE="`webapp_strip_cwd \"$MY_FILE\"`" 134 MY_FILE="$(webapp_strip_cwd "${MY_FILE}")"
123 135
124 einfo "(config) $MY_FILE" 136 elog "(config) ${MY_FILE}"
125 echo "$MY_FILE" >> ${D}${WA_CONFIGLIST} 137 echo "${MY_FILE}" >> ${D}/${WA_CONFIGLIST}
138 done
126} 139}
127 140
128# ------------------------------------------------------------------------ 141# ------------------------------------------------------------------------
129# EXPORTED FUNCTION - FOR USE IN EBUILDS 142# EXPORTED FUNCTION - FOR USE IN EBUILDS
130# 143#
134# @param $1 - the script to run 147# @param $1 - the script to run
135# ------------------------------------------------------------------------ 148# ------------------------------------------------------------------------
136 149
137function webapp_hook_script () 150function webapp_hook_script ()
138{ 151{
139 webapp_checkfileexists "$1" 152 webapp_checkfileexists "${1}"
140 153
141 einfo "(hook) $1" 154 elog "(hook) ${1}"
142 cp "$1" "${D}${MY_HOOKSCRIPTSDIR}/`basename $1`" || die "Unable to install $1 into ${D}${MY_HOOKSCRIPTSDIR}/" 155 cp "${1}" "${D}/${MY_HOOKSCRIPTSDIR}/$(basename "${1}")" || die "Unable to install ${1} into ${D}/${MY_HOOKSCRIPTSDIR}/"
143 chmod 555 "${D}${MY_HOOKSCRIPTSDIR}/`basename $1`" 156 chmod 555 "${D}/${MY_HOOKSCRIPTSDIR}/$(basename "${1}")"
144} 157}
145 158
146# ------------------------------------------------------------------------ 159# ------------------------------------------------------------------------
147# EXPORTED FUNCTION - FOR USE IN EBUILDS 160# EXPORTED FUNCTION - FOR USE IN EBUILDS
148# 161#
152# @param $2 - the file to install 165# @param $2 - the file to install
153# ------------------------------------------------------------------------ 166# ------------------------------------------------------------------------
154 167
155function webapp_postinst_txt () 168function webapp_postinst_txt ()
156{ 169{
157 webapp_checkfileexists "$2" 170 webapp_checkfileexists "${2}"
158 171
159 einfo "(rtfm) $2 (lang: $1)" 172 elog "(info) ${2} (lang: ${1})"
160 cp "$2" "${D}${MY_APPDIR}/postinst-$1.txt" 173 cp "${2}" "${D}/${MY_APPDIR}/postinst-${1}.txt"
161} 174}
162 175
163# ------------------------------------------------------------------------ 176# ------------------------------------------------------------------------
164# EXPORTED FUNCTION - FOR USE IN EBUILDS 177# EXPORTED FUNCTION - FOR USE IN EBUILDS
165# 178#
169# @param $2 - the file to install 182# @param $2 - the file to install
170# ------------------------------------------------------------------------ 183# ------------------------------------------------------------------------
171 184
172function webapp_postupgrade_txt () 185function webapp_postupgrade_txt ()
173{ 186{
174 webapp_checkfileexists "$2" 187 webapp_checkfileexists "${2}"
175 188
176 einfo "(rtfm) $2 (lang: $1)" 189 elog "(info) ${2} (lang: ${1})"
177 cp "$2" "${D}${MY_APPDIR}/postupgrade-$1.txt" 190 cp "${2}" "${D}/${MY_APPDIR}/postupgrade-${1}.txt"
178}
179
180# ------------------------------------------------------------------------
181# DEPRECATED FUNCTION
182#
183# It never worked anyway
184
185function webapp_runbycgibin ()
186{
187 if [ -n "$WARN_RUNBYCGIBIN" ] ; then
188 return
189 fi
190
191 ewarn "This ebuild uses webapp.eclass's webapp_runbycgibin, which is now"
192 ewarn "deprecated. Please file a bug about this in Bugzilla."
193 WARN_RUNBYCGIBIN=1
194} 191}
195 192
196# ------------------------------------------------------------------------ 193# ------------------------------------------------------------------------
197# EXPORTED FUNCTION - FOR USE IN EBUILDS 194# EXPORTED FUNCTION - FOR USE IN EBUILDS
198# 195#
206# 203#
207# ------------------------------------------------------------------------ 204# ------------------------------------------------------------------------
208 205
209function webapp_serverowned () 206function webapp_serverowned ()
210{ 207{
208 local a=""
209 local m=""
210 if [ "${1}" = "-R" ]; then
211 shift
212 for m in "$@" ; do
213 for a in $(find ${D}/${m}); do
214 a=${a/${D}\/\///}
215 webapp_checkfileexists "${a}" "$D"
216 local MY_FILE="$(webapp_strip_appdir "${a}")"
217 MY_FILE="$(webapp_strip_cwd "${MY_FILE}")"
218
219 elog "(server owned) ${MY_FILE}"
220 echo "${MY_FILE}" >> "${D}/${WA_SOLIST}"
221 done
222 done
223 else
224 for m in "$@" ; do
211 webapp_checkfileexists "$1" "$D" 225 webapp_checkfileexists "${m}" "$D"
212 local MY_FILE="`webapp_strip_appdir \"$1\"`" 226 local MY_FILE="$(webapp_strip_appdir "${m}")"
213 MY_FILE="`webapp_strip_cwd \"$MY_FILE\"`" 227 MY_FILE="$(webapp_strip_cwd "${MY_FILE}")"
214 228
215 einfo "(server owned) $MY_FILE" 229 elog "(server owned) ${MY_FILE}"
216 echo "$MY_FILE" >> "${D}${WA_SOLIST}" 230 echo "${MY_FILE}" >> "${D}/${WA_SOLIST}"
231 done
232 fi
217} 233}
218 234
219# ------------------------------------------------------------------------ 235# ------------------------------------------------------------------------
220# EXPORTED FUNCTION - FOR USE IN EBUILDS 236# EXPORTED FUNCTION - FOR USE IN EBUILDS
221# 237#
230# config file's name 246# config file's name
231# ------------------------------------------------------------------------ 247# ------------------------------------------------------------------------
232 248
233function webapp_server_configfile () 249function webapp_server_configfile ()
234{ 250{
235 webapp_checkfileexists "$2" 251 webapp_checkfileexists "${2}"
236 252
237 # sort out what the name will be of the config file 253 # sort out what the name will be of the config file
238 254
239 local my_file 255 local my_file
240 256
241 if [ -z "$3" ]; then 257 if [ -z "${3}" ]; then
242 my_file="$1-`basename $2`" 258 my_file="${1}-$(basename "${2}")"
243 else 259 else
244 my_file="$1-$3" 260 my_file="${1}-${3}"
245 fi 261 fi
246 262
247 # warning: 263 # warning:
248 # 264 #
249 # do NOT change the naming convention used here without changing all 265 # do NOT change the naming convention used here without changing all
250 # the other scripts that also rely upon these names 266 # the other scripts that also rely upon these names
251 267
252 einfo "($1) config file '$my_file'" 268 elog "(${1}) config file '${my_file}'"
253 cp "$2" "${D}${MY_SERVERCONFIGDIR}/${my_file}" 269 cp "${2}" "${D}/${MY_SERVERCONFIGDIR}/${my_file}"
254} 270}
255 271
256# ------------------------------------------------------------------------ 272# ------------------------------------------------------------------------
257# EXPORTED FUNCTION - FOR USE IN EBUILDS 273# EXPORTED FUNCTION - FOR USE IN EBUILDS
258# 274#
265# a new db from scratch) 281# a new db from scratch)
266# ------------------------------------------------------------------------ 282# ------------------------------------------------------------------------
267 283
268function webapp_sqlscript () 284function webapp_sqlscript ()
269{ 285{
270 webapp_checkfileexists "$2" 286 webapp_checkfileexists "${2}"
271 287
272 # create the directory where this script will go 288 # create the directory where this script will go
273 # 289 #
274 # scripts for specific database engines go into their own subdirectory 290 # scripts for specific database engines go into their own subdirectory
275 # just to keep things readable on the filesystem 291 # just to keep things readable on the filesystem
276 292
277 if [ ! -d "${D}${MY_SQLSCRIPTSDIR}/$1" ]; then 293 if [ ! -d "${D}/${MY_SQLSCRIPTSDIR}/${1}" ]; then
278 mkdir -p "${D}${MY_SQLSCRIPTSDIR}/$1" || libsh_die "unable to create directory ${D}${MY_SQLSCRIPTSDIR}/$1" 294 mkdir -p "${D}/${MY_SQLSCRIPTSDIR}/${1}" || die "unable to create directory ${D}/${MY_SQLSCRIPTSDIR}/${1}"
279 fi 295 fi
280 296
281 # warning: 297 # warning:
282 # 298 #
283 # do NOT change the naming convention used here without changing all 299 # do NOT change the naming convention used here without changing all
284 # the other scripts that also rely upon these names 300 # the other scripts that also rely upon these names
285 301
286 # are we dealing with an 'upgrade'-type script? 302 # are we dealing with an 'upgrade'-type script?
287 if [ -n "$3" ]; then 303 if [ -n "${3}" ]; then
288 # yes we are 304 # yes we are
289 einfo "($1) upgrade script from ${PN}-${PVR} to $3" 305 elog "(${1}) upgrade script from ${PN}-${PVR} to ${3}"
290 cp "$2" "${D}${MY_SQLSCRIPTSDIR}/$1/${3}_to_${PVR}.sql" 306 cp "${2}" "${D}${MY_SQLSCRIPTSDIR}/${1}/${3}_to_${PVR}.sql"
291 chmod 600 "${D}${MY_SQLSCRIPTSDIR}/$1/${3}_to_${PVR}.sql" 307 chmod 600 "${D}${MY_SQLSCRIPTSDIR}/${1}/${3}_to_${PVR}.sql"
292 else 308 else
293 # no, we are not 309 # no, we are not
294 einfo "($1) create script for ${PN}-${PVR}" 310 elog "(${1}) create script for ${PN}-${PVR}"
295 cp "$2" "${D}${MY_SQLSCRIPTSDIR}/$1/${PVR}_create.sql" 311 cp "${2}" "${D}/${MY_SQLSCRIPTSDIR}/${1}/${PVR}_create.sql"
296 chmod 600 "${D}${MY_SQLSCRIPTSDIR}/$1/${PVR}_create.sql" 312 chmod 600 "${D}/${MY_SQLSCRIPTSDIR}/${1}/${PVR}_create.sql"
297 fi 313 fi
298} 314}
299 315
300# ------------------------------------------------------------------------ 316# ------------------------------------------------------------------------
301# EXPORTED FUNCTION - call from inside your ebuild's src_install AFTER 317# EXPORTED FUNCTION - call from inside your ebuild's src_install AFTER
302# everything else has run 318# everything else has run
303# 319#
304# For now, we just make sure that root owns everything, and that there 320# For now, we just make sure that root owns everything, and that there
305# are no setuid files. I'm sure this will change significantly before 321# are no setuid files.
306# the final version!
307# ------------------------------------------------------------------------ 322# ------------------------------------------------------------------------
308 323
309function webapp_src_install () 324function webapp_src_install ()
310{ 325{
311 chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/" 326 chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/"
312 chmod -R u-s "${D}/" 327 chmod -R u-s "${D}/"
313 chmod -R g-s "${D}/" 328 chmod -R g-s "${D}/"
314 329
315 keepdir "${MY_PERSISTDIR}" 330 keepdir "${MY_PERSISTDIR}"
316 fowners "root:root" "${MY_PERSISTDIR}" 331 fowners "root:0" "${MY_PERSISTDIR}"
317 fperms 755 "${MY_PERSISTDIR}" 332 fperms 755 "${MY_PERSISTDIR}"
318 333
319 # to test whether or not the ebuild has correctly called this function 334 # to test whether or not the ebuild has correctly called this function
320 # we add an empty file to the filesystem 335 # we add an empty file to the filesystem
321 # 336 #
336 351
337function webapp_pkg_setup () 352function webapp_pkg_setup ()
338{ 353{
339 # add sanity checks here 354 # add sanity checks here
340 355
341 if [ "$SLOT+" != "${PVR}+" ]; then 356 # special case - some ebuilds *do* need to overwride the SLOT
342 if [ "$WEBAPP_MANUAL_SLOT" != "yes" ]; then 357 if [[ "${SLOT}+" != "${PVR}+" && "${WEBAPP_MANUAL_SLOT}" != "yes" ]]; then
343 die "ebuild sets SLOT, overrides webapp.eclass" 358 die "Set WEBAPP_MANUAL_SLOT=\"yes\" if you need to SLOT manually"
344 fi
345 fi 359 fi
346 360
347 # pull in the shared configuration file 361 # pull in the shared configuration file
348 362
349 G_HOSTNAME="localhost" 363 G_HOSTNAME="localhost"
350 . "${ETC_CONFIG}" || die "Unable to open file ${ETC_CONFIG}" 364 webapp_read_config
351 365
352 # are we installing a webapp-config solution over the top of a 366 # are we installing a webapp-config solution over the top of a
353 # non-webapp-config solution? 367 # non-webapp-config solution?
354 368
355 if ! use vhosts ; then 369 if ! use vhosts ; then
356 local my_dir="$VHOST_ROOT/$MY_HTDOCSBASE/$PN" 370 local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
357 local my_output 371 local my_output
358 372
359 if [ -d "$my_dir" ] ; then 373 if [ -d "${my_dir}" ] ; then
360 einfo "You already have something installed in $my_dir"
361 einfo "Are you trying to install over the top of something I cannot upgrade?"
362
363 my_output="`webapp_check_installedat`" 374 my_output="$(webapp_check_installedat)"
364 375
365 if [ "$?" != "0" ]; then 376 if [ "$?" != "0" ]; then
366
367 # okay, whatever is there, it isn't webapp-config-compatible 377 # okay, whatever is there, it isn't webapp-config-compatible
378 ewarn "You already have something installed in ${my_dir}"
368 ewarn 379 ewarn
369 ewarn "Whatever is in $my_dir, it's not" 380 ewarn "Whatever is in ${my_dir}, it's not"
370 ewarn "compatible with webapp-config." 381 ewarn "compatible with webapp-config."
371 ewarn 382 ewarn
372 ewarn "This ebuild may be overwriting important files." 383 ewarn "This ebuild may be overwriting important files."
373 ewarn 384 ewarn
374 elif [ "`echo $my_output | awk '{ print $1 }'`" != "$PN" ]; then 385 elif [ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]; then
375 eerror "$my_dir contains $my_output" 386 eerror "${my_dir} contains ${my_output}"
376 eerror "I cannot upgrade that" 387 eerror "I cannot upgrade that"
377 die "Cannot upgrade contents of $my_dir" 388 die "Cannot upgrade contents of ${my_dir}"
378 else
379 einfo
380 einfo "I can upgrade the contents of $my_dir"
381 einfo
382 fi 389 fi
383 fi 390 fi
384 fi 391 fi
385} 392}
386 393
387function webapp_someunusedfunction ()
388{
389 # are we emerging something that is already installed?
390
391 if [ -d "${D}${MY_APPROOT}/${MY_APPSUFFIX}" ]; then
392 # yes we are
393 ewarn "Removing existing copy of ${PN}-${PVR}"
394 rm -rf "${D}${MY_APPROOT}/${MY_APPSUFFIX}"
395 fi
396}
397
398function webapp_getinstalltype () 394function webapp_getinstalltype ()
399{ 395{
400 # or are we upgrading? 396 # or are we upgrading?
401 397
402 if ! use vhosts ; then 398 if ! use vhosts ; then
403 # we only run webapp-config if vhosts USE flag is not set 399 # we only run webapp-config if vhosts USE flag is not set
404 400
405 local my_output 401 local my_output
406 402
407 my_output="`webapp_check_installedat`" 403 my_output="$(webapp_check_installedat)"
408 404
409 if [ "$?" = "0" ] ; then 405 if [ "${?}" = "0" ] ; then
410 # something is already installed there 406 # something is already installed there
411 # 407 #
412 # make sure it isn't the same version 408 # make sure it isn't the same version
413 409
414 local my_pn="`echo $my_output | awk '{ print $1 }'`" 410 local my_pn="$(echo ${my_output} | awk '{ print $1 }')"
415 local my_pvr="`echo $my_output | awk '{ print $2 }'`" 411 local my_pvr="$(echo ${my_output} | awk '{ print $2 }')"
416 412
417 REMOVE_PKG="${my_pn}-${my_pvr}" 413 REMOVE_PKG="${my_pn}-${my_pvr}"
418 414
419 if [ "$my_pn" == "$PN" ]; then 415 if [ "${my_pn}" == "${PN}" ]; then
420 if [ "$my_pvr" != "$PVR" ]; then 416 if [ "${my_pvr}" != "${PVR}" ]; then
421 einfo "This is an upgrade" 417 elog "This is an upgrade"
422 IS_UPGRADE=1 418 IS_UPGRADE=1
423 else 419 else
424 einfo "This is a re-installation" 420 elog "This is a re-installation"
425 IS_REPLACE=1 421 IS_REPLACE=1
426 fi 422 fi
427 else 423 else
428 einfo "$my_ouptut is installed there" 424 elog "${my_output} is installed there"
429 fi 425 fi
430 else 426 else
431 einfo "This is an installation" 427 elog "This is an installation"
432 fi 428 fi
433 fi 429 fi
434} 430}
435 431
436function webapp_src_preinst () 432function webapp_src_preinst ()
447 dodir "${MY_SERVERCONFIGDIR}" 443 dodir "${MY_SERVERCONFIGDIR}"
448} 444}
449 445
450function webapp_pkg_postinst () 446function webapp_pkg_postinst ()
451{ 447{
452 . "${ETC_CONFIG}" 448 webapp_read_config
453 449
454 # sanity checks, to catch bugs in the ebuild 450 # sanity checks, to catch bugs in the ebuild
455 451
456 if [ ! -f "${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]; then 452 if [ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]; then
457 eerror 453 eerror
458 eerror "This ebuild did not call webapp_src_install() at the end" 454 eerror "This ebuild did not call webapp_src_install() at the end"
459 eerror "of the src_install() function" 455 eerror "of the src_install() function"
460 eerror 456 eerror
461 eerror "Please log a bug on http://bugs.gentoo.org" 457 eerror "Please log a bug on http://bugs.gentoo.org"
465 eerror 461 eerror
466 die "Ebuild did not call webapp_src_install() - report to http://bugs.gentoo.org" 462 die "Ebuild did not call webapp_src_install() - report to http://bugs.gentoo.org"
467 fi 463 fi
468 464
469 # if 'vhosts' is not set in your USE flags, we install a copy of 465 # if 'vhosts' is not set in your USE flags, we install a copy of
470 # this application in /var/www/localhost/htdocs/${PN}/ for you 466 # this application in ${ROOT}/var/www/localhost/htdocs/${PN}/ for you
471 467
472 if ! use vhosts ; then 468 if ! use vhosts ; then
473 echo 469 echo
474 einfo "vhosts USE flag not set - auto-installing using webapp-config" 470 elog "vhosts USE flag not set - auto-installing using webapp-config"
475 471
476 webapp_getinstalltype 472 webapp_getinstalltype
477 473
478 G_HOSTNAME="localhost" 474 G_HOSTNAME="localhost"
479 . "${ETC_CONFIG}"
480
481 local my_mode=-I 475 local my_mode=-I
476 webapp_read_config
482 477
483 if [ "$IS_REPLACE" = "1" ]; then 478 if [ "${IS_REPLACE}" = "1" ]; then
484 einfo "${PN}-${PVR} is already installed - replacing" 479 elog "${PN}-${PVR} is already installed - replacing"
485 my_mode=-I 480 my_mode=-I
486 elif [ "$IS_UPGRADE" = "1" ]; then 481 elif [ "${IS_UPGRADE}" = "1" ]; then
487 einfo "$REMOVE_PKG is already installed - upgrading" 482 elog "${REMOVE_PKG} is already installed - upgrading"
488 my_mode=-U 483 my_mode=-U
489 else 484 else
490 einfo "${PN}-${PVR} is not installed - using install mode" 485 elog "${PN}-${PVR} is not installed - using install mode"
491 fi 486 fi
492 487
493 my_cmd="/usr/sbin/webapp-config $my_mode -h localhost -u root -d $INSTALL_DIR ${PN} ${PVR}" 488 my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}"
494 einfo "Running $my_cmd" 489 elog "Running ${my_cmd}"
495 $my_cmd 490 ${my_cmd}
496 491
497 # remove the old version 492 # run webapp-cleaner instead of emerge
498 # 493 echo
499 # why do we do this? well ... 494 local cleaner="${WEBAPP_CLEANER} -p -C ${PN}"
500 # 495 einfo "Running ${cleaner}"
501 # normally, emerge -u installs a new version and then removes the 496 ${cleaner}
502 # old version. however, if the new version goes into a different
503 # slot to the old version, then the old version gets left behind
504 #
505 # if USE=-vhosts, then we want to remove the old version, because
506 # the user is relying on portage to do the magical thing for it
507
508 if [ "$IS_UPGRADE" = "1" ] ; then
509 einfo "Removing old version $REMOVE_PKG"
510
511 emerge -C "$REMOVE_PKG"
512 fi
513 else 497 else
514 # vhosts flag is on 498 # vhosts flag is on
515 # 499 #
516 # let's tell the administrator what to do next 500 # let's tell the administrator what to do next
517 501
518 einfo 502 elog
519 einfo "The 'vhosts' USE flag is switched ON" 503 elog "The 'vhosts' USE flag is switched ON"
520 einfo "This means that Portage will not automatically run webapp-config to" 504 elog "This means that Portage will not automatically run webapp-config to"
521 einfo "complete the installation." 505 elog "complete the installation."
522 einfo 506 elog
523 einfo "To install $PN-$PVR into a virtual host, run the following command:" 507 elog "To install ${PN}-${PVR} into a virtual host, run the following command:"
524 einfo 508 elog
525 einfo " webapp-config -I -h <host> -d $PN $PN $PVR" 509 elog " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}"
526 einfo 510 elog
527 einfo "For more details, see the webapp-config(8) man page" 511 elog "For more details, see the webapp-config(8) man page"
528 fi 512 fi
529 513
530 return 0 514 return 0
531} 515}
532 516
535 # remove any virtual installs that there are 519 # remove any virtual installs that there are
536 520
537 local my_output 521 local my_output
538 local x 522 local x
539 523
540 my_output="`webapp-config --list-installs $PN $PVR`" 524 my_output="$(${WEBAPP_CONFIG} --list-installs ${PN} ${PVR})"
541 525
542 if [ "$?" != "0" ]; then 526 if [ "${?}" != "0" ]; then
543 return 527 return
544 fi 528 fi
545 529
546 # the changes to IFS here are necessary to ensure that we can cope
547 # with directories that contain spaces in the file names
548
549 # OLD_IFS="$IFS"
550 # IFS=" "
551
552 for x in $my_output ; do 530 for x in ${my_output} ; do
553 # IFS="$OLD_IFS"
554
555 [ -f $x/.webapp ] && . $x/.webapp || ewarn "Cannot find file $x/.webapp" 531 [ -f ${x}/.webapp ] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp"
556 532
557 if [ -z "WEB_HOSTNAME" -o -z "WEB_INSTALLDIR" ]; then 533 if [ -z "${WEB_HOSTNAME}" -o -z "${WEB_INSTALLDIR}" ]; then
558 ewarn "Don't forget to use webapp-config to remove the copy of" 534 ewarn "Don't forget to use webapp-config to remove the copy of"
559 ewarn "${PN}-${PVR} installed in" 535 ewarn "${PN}-${PVR} installed in"
560 ewarn 536 ewarn
561 ewarn " $x" 537 ewarn " ${x}"
562 ewarn 538 ewarn
563 else 539 else
564 # we have enough information to remove the virtual copy ourself 540 # we have enough information to remove the virtual copy ourself
565 541
566 webapp-config -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} 542 ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR}
567 543
568 # if the removal fails - we carry on anyway! 544 # if the removal fails - we carry on anyway!
569 fi 545 fi
570 # IFS=" "
571 done 546 done
572
573 # IFS="$OLD_IFS"
574} 547}

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.47

  ViewVC Help
Powered by ViewVC 1.1.20