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

Diff of /eclass/webapp.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20