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

Diff of /eclass/webapp.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20