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

Diff of /eclass/webapp.eclass

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

Revision 1.26 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.26 2004/06/28 16:00:29 stuart 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.7 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 echo $1 132
123 local MY_FILE="`webapp_strip_appdir \"$1\"`" 133 local MY_FILE="$(webapp_strip_appdir "${m}")"
124 echo $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 227 MY_FILE="$(webapp_strip_cwd "${MY_FILE}")"
228
206 einfo "(server owned) $MY_FILE" 229 elog "(server owned) ${MY_FILE}"
207 echo "$MY_FILE" >> "${D}${WA_SOLIST}" 230 echo "${MY_FILE}" >> "${D}/${WA_SOLIST}"
231 done
232 fi
208} 233}
209 234
210# ------------------------------------------------------------------------ 235# ------------------------------------------------------------------------
211# EXPORTED FUNCTION - FOR USE IN EBUILDS 236# EXPORTED FUNCTION - FOR USE IN EBUILDS
212# 237#
221# config file's name 246# config file's name
222# ------------------------------------------------------------------------ 247# ------------------------------------------------------------------------
223 248
224function webapp_server_configfile () 249function webapp_server_configfile ()
225{ 250{
226 webapp_checkfileexists "$2" 251 webapp_checkfileexists "${2}"
227 252
228 # sort out what the name will be of the config file 253 # sort out what the name will be of the config file
229 254
230 local my_file 255 local my_file
231 256
232 if [ -z "$3" ]; then 257 if [ -z "${3}" ]; then
233 my_file="$1-`basename $2`" 258 my_file="${1}-$(basename "${2}")"
234 else 259 else
235 my_file="$1-$3" 260 my_file="${1}-${3}"
236 fi 261 fi
237 262
238 # warning: 263 # warning:
239 # 264 #
240 # do NOT change the naming convention used here without changing all 265 # do NOT change the naming convention used here without changing all
241 # the other scripts that also rely upon these names 266 # the other scripts that also rely upon these names
242 267
243 einfo "($1) config file '$my_file'" 268 elog "(${1}) config file '${my_file}'"
244 cp "$2" "${D}${MY_SERVERCONFIGDIR}/${my_file}" 269 cp "${2}" "${D}/${MY_SERVERCONFIGDIR}/${my_file}"
245} 270}
246 271
247# ------------------------------------------------------------------------ 272# ------------------------------------------------------------------------
248# EXPORTED FUNCTION - FOR USE IN EBUILDS 273# EXPORTED FUNCTION - FOR USE IN EBUILDS
249# 274#
256# a new db from scratch) 281# a new db from scratch)
257# ------------------------------------------------------------------------ 282# ------------------------------------------------------------------------
258 283
259function webapp_sqlscript () 284function webapp_sqlscript ()
260{ 285{
261 webapp_checkfileexists "$2" 286 webapp_checkfileexists "${2}"
262 287
263 # create the directory where this script will go 288 # create the directory where this script will go
264 # 289 #
265 # scripts for specific database engines go into their own subdirectory 290 # scripts for specific database engines go into their own subdirectory
266 # just to keep things readable on the filesystem 291 # just to keep things readable on the filesystem
267 292
268 if [ ! -d "${D}${MY_SQLSCRIPTSDIR}/$1" ]; then 293 if [ ! -d "${D}/${MY_SQLSCRIPTSDIR}/${1}" ]; then
269 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}"
270 fi 295 fi
271 296
272 # warning: 297 # warning:
273 # 298 #
274 # do NOT change the naming convention used here without changing all 299 # do NOT change the naming convention used here without changing all
275 # the other scripts that also rely upon these names 300 # the other scripts that also rely upon these names
276 301
277 # are we dealing with an 'upgrade'-type script? 302 # are we dealing with an 'upgrade'-type script?
278 if [ -n "$3" ]; then 303 if [ -n "${3}" ]; then
279 # yes we are 304 # yes we are
280 einfo "($1) upgrade script from ${PN}-${PVR} to $3" 305 elog "(${1}) upgrade script from ${PN}-${PVR} to ${3}"
281 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"
282 else 308 else
283 # no, we are not 309 # no, we are not
284 einfo "($1) create script for ${PN}-${PVR}" 310 elog "(${1}) create script for ${PN}-${PVR}"
285 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"
286 fi 313 fi
287} 314}
288 315
289# ------------------------------------------------------------------------ 316# ------------------------------------------------------------------------
290# EXPORTED FUNCTION - call from inside your ebuild's src_install AFTER 317# EXPORTED FUNCTION - call from inside your ebuild's src_install AFTER
291# everything else has run 318# everything else has run
292# 319#
293# 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
294# are no setuid files. I'm sure this will change significantly before 321# are no setuid files.
295# the final version!
296# ------------------------------------------------------------------------ 322# ------------------------------------------------------------------------
297 323
298function webapp_src_install () 324function webapp_src_install ()
299{ 325{
300 chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/" 326 chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/"
301 chmod -R u-s "${D}/" 327 chmod -R u-s "${D}/"
302 chmod -R g-s "${D}/" 328 chmod -R g-s "${D}/"
303 329
304 keepdir "${MY_PERSISTDIR}" 330 keepdir "${MY_PERSISTDIR}"
305 fowners "root:root" "${MY_PERSISTDIR}" 331 fowners "root:0" "${MY_PERSISTDIR}"
306 fperms 755 "${MY_PERSISTDIR}" 332 fperms 755 "${MY_PERSISTDIR}"
307 333
308 # 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
309 # we add an empty file to the filesystem 335 # we add an empty file to the filesystem
310 # 336 #
325 351
326function webapp_pkg_setup () 352function webapp_pkg_setup ()
327{ 353{
328 # add sanity checks here 354 # add sanity checks here
329 355
330 if [ "$SLOT+" != "${PVR}+" ]; then 356 # special case - some ebuilds *do* need to overwride the SLOT
331 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"
332 fi 359 fi
333 360
334 # pull in the shared configuration file 361 # pull in the shared configuration file
335 362
336 G_HOSTNAME="localhost" 363 G_HOSTNAME="localhost"
337 . "${ETC_CONFIG}" || die "Unable to open file ${ETC_CONFIG}" 364 webapp_read_config
338 365
339 # 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
340 # non-webapp-config solution? 367 # non-webapp-config solution?
341 368
342 if ! use vhosts ; then 369 if ! use vhosts ; then
343 local my_dir="$VHOST_ROOT/$MY_HTDOCSBASE/$PN" 370 local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
344 local my_output 371 local my_output
345 372
346 if [ -d "$my_dir" ] ; then 373 if [ -d "${my_dir}" ] ; then
347 einfo "You already have something installed in $my_dir"
348 einfo "Are you trying to install over the top of something I cannot upgrade?"
349
350 my_output="`webapp_check_installedat`" 374 my_output="$(webapp_check_installedat)"
351 375
352 if [ "$?" != "0" ]; then 376 if [ "$?" != "0" ]; then
353
354 # 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}"
355 ewarn 379 ewarn
356 ewarn "Whatever is in $my_dir, it's not" 380 ewarn "Whatever is in ${my_dir}, it's not"
357 ewarn "compatible with webapp-config." 381 ewarn "compatible with webapp-config."
358 ewarn 382 ewarn
359 ewarn "This ebuild may be overwriting important files." 383 ewarn "This ebuild may be overwriting important files."
360 ewarn 384 ewarn
361 elif [ "`echo $my_output | awk '{ print $1 }'`" != "$PN" ]; then 385 elif [ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]; then
362 eerror "$my_dir contains $my_output" 386 eerror "${my_dir} contains ${my_output}"
363 eerror "I cannot upgrade that" 387 eerror "I cannot upgrade that"
364 die "Cannot upgrade contents of $my_dir" 388 die "Cannot upgrade contents of ${my_dir}"
365 else
366 einfo
367 einfo "I can upgrade the contents of $my_dir"
368 einfo
369 fi 389 fi
370 fi 390 fi
371 fi 391 fi
372} 392}
373 393
374function webapp_someunusedfunction ()
375{
376 # are we emerging something that is already installed?
377
378 if [ -d "${D}${MY_APPROOT}/${MY_APPSUFFIX}" ]; then
379 # yes we are
380 ewarn "Removing existing copy of ${PN}-${PVR}"
381 rm -rf "${D}${MY_APPROOT}/${MY_APPSUFFIX}"
382 fi
383}
384
385function webapp_getinstalltype () 394function webapp_getinstalltype ()
386{ 395{
387 # or are we upgrading? 396 # or are we upgrading?
388 397
389 if ! use vhosts ; then 398 if ! use vhosts ; then
390 # 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
391 400
392 local my_output 401 local my_output
393 402
394 my_output="`webapp_check_installedat`" 403 my_output="$(webapp_check_installedat)"
395 404
396 if [ "$?" = "0" ] ; then 405 if [ "${?}" = "0" ] ; then
397 # something is already installed there 406 # something is already installed there
398 # 407 #
399 # make sure it isn't the same version 408 # make sure it isn't the same version
400 409
401 local my_pn="`echo $my_output | awk '{ print $1 }'`" 410 local my_pn="$(echo ${my_output} | awk '{ print $1 }')"
402 local my_pvr="`echo $my_output | awk '{ print $2 }'`" 411 local my_pvr="$(echo ${my_output} | awk '{ print $2 }')"
403 412
404 REMOVE_PKG="${my_pn}-${my_pvr}" 413 REMOVE_PKG="${my_pn}-${my_pvr}"
405 414
406 if [ "$my_pn" == "$PN" ]; then 415 if [ "${my_pn}" == "${PN}" ]; then
407 if [ "$my_pvr" != "$PVR" ]; then 416 if [ "${my_pvr}" != "${PVR}" ]; then
408 einfo "This is an upgrade" 417 elog "This is an upgrade"
409 IS_UPGRADE=1 418 IS_UPGRADE=1
410 else 419 else
411 einfo "This is a re-installation" 420 elog "This is a re-installation"
412 IS_REPLACE=1 421 IS_REPLACE=1
413 fi 422 fi
414 else 423 else
415 einfo "$my_ouptut is installed there" 424 elog "${my_output} is installed there"
416 fi 425 fi
417 else 426 else
418 einfo "This is an installation" 427 elog "This is an installation"
419 fi 428 fi
420 fi 429 fi
421} 430}
422 431
423function webapp_src_preinst () 432function webapp_src_preinst ()
434 dodir "${MY_SERVERCONFIGDIR}" 443 dodir "${MY_SERVERCONFIGDIR}"
435} 444}
436 445
437function webapp_pkg_postinst () 446function webapp_pkg_postinst ()
438{ 447{
439 . "${ETC_CONFIG}" 448 webapp_read_config
440 449
441 # sanity checks, to catch bugs in the ebuild 450 # sanity checks, to catch bugs in the ebuild
442 451
443 if [ ! -f "${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]; then 452 if [ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]; then
444 eerror 453 eerror
445 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"
446 eerror "of the src_install() function" 455 eerror "of the src_install() function"
447 eerror 456 eerror
448 eerror "Please log a bug on http://bugs.gentoo.org" 457 eerror "Please log a bug on http://bugs.gentoo.org"
452 eerror 461 eerror
453 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"
454 fi 463 fi
455 464
456 # 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
457 # this application in /var/www/localhost/htdocs/${PN}/ for you 466 # this application in ${ROOT}/var/www/localhost/htdocs/${PN}/ for you
458 467
459 if ! use vhosts ; then 468 if ! use vhosts ; then
460 echo 469 echo
461 einfo "vhosts USE flag not set - auto-installing using webapp-config" 470 elog "vhosts USE flag not set - auto-installing using webapp-config"
462 471
463 webapp_getinstalltype 472 webapp_getinstalltype
464 473
465 G_HOSTNAME="localhost" 474 G_HOSTNAME="localhost"
466 . "${ETC_CONFIG}"
467
468 local my_mode=-I 475 local my_mode=-I
476 webapp_read_config
469 477
470 if [ "$IS_REPLACE" = "1" ]; then 478 if [ "${IS_REPLACE}" = "1" ]; then
471 einfo "${PN}-${PVR} is already installed - replacing" 479 elog "${PN}-${PVR} is already installed - replacing"
472 /usr/sbin/webapp-config -C -d "$INSTALL_DIR" 480 my_mode=-I
473 elif [ "$IS_UPGRADE" = "1" ]; then 481 elif [ "${IS_UPGRADE}" = "1" ]; then
474 einfo "$REMOVE_PKG is already installed - upgrading" 482 elog "${REMOVE_PKG} is already installed - upgrading"
475 my_mode=-U 483 my_mode=-U
476 else 484 else
477 einfo "${PN}-${PVR} is not installed - using install mode" 485 elog "${PN}-${PVR} is not installed - using install mode"
478 fi 486 fi
479 487
480 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}"
481 einfo "Running $my_cmd" 489 elog "Running ${my_cmd}"
482 $my_cmd 490 ${my_cmd}
483 491
484 # remove the old version 492 # run webapp-cleaner instead of emerge
485 # 493 echo
486 # why do we do this? well ... 494 local cleaner="${WEBAPP_CLEANER} -p -C ${PN}"
487 # 495 einfo "Running ${cleaner}"
488 # normally, emerge -u installs a new version and then removes the 496 ${cleaner}
489 # old version. however, if the new version goes into a different
490 # slot to the old version, then the old version gets left behind
491 #
492 # if USE=-vhosts, then we want to remove the old version, because
493 # the user is relying on portage to do the magical thing for it
494
495 if [ "$IS_UPGRADE" = "1" ] ; then
496 einfo "Removing old version $REMOVE_PKG"
497
498 emerge -C "$CATEGORY/$REMOVE_PKG"
499 fi
500 else 497 else
501 # vhosts flag is on 498 # vhosts flag is on
502 # 499 #
503 # let's tell the administrator what to do next 500 # let's tell the administrator what to do next
504 501
505 einfo 502 elog
506 einfo "The 'vhosts' USE flag is switched ON" 503 elog "The 'vhosts' USE flag is switched ON"
507 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"
508 einfo "complete the installation." 505 elog "complete the installation."
509 einfo 506 elog
510 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:"
511 einfo 508 elog
512 einfo " webapp-config -I -h <host> -d $PN $PN $PVR" 509 elog " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}"
513 einfo 510 elog
514 einfo "For more details, see the webapp-config(8) man page" 511 elog "For more details, see the webapp-config(8) man page"
515 fi 512 fi
516 513
517 return 0 514 return 0
518} 515}
519 516
522 # remove any virtual installs that there are 519 # remove any virtual installs that there are
523 520
524 local my_output 521 local my_output
525 local x 522 local x
526 523
527 my_output="`webapp-config --list-installs $PN $PVR`" 524 my_output="$(${WEBAPP_CONFIG} --list-installs ${PN} ${PVR})"
528 525
529 if [ "$?" != "0" ]; then 526 if [ "${?}" != "0" ]; then
530 return 527 return
531 fi 528 fi
532 529
533 # the changes to IFS here are necessary to ensure that we can cope
534 # with directories that contain spaces in the file names
535
536 # OLD_IFS="$IFS"
537 # IFS=" "
538
539 for x in $my_output ; do 530 for x in ${my_output} ; do
540 # IFS="$OLD_IFS"
541
542 [ -f $x/.webapp ] && . $x/.webapp || ewarn "Cannot find file $x/.webapp" 531 [ -f ${x}/.webapp ] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp"
543 532
544 if [ -z "WEB_HOSTNAME" -o -z "WEB_INSTALLDIR" ]; then 533 if [ -z "${WEB_HOSTNAME}" -o -z "${WEB_INSTALLDIR}" ]; then
545 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"
546 ewarn "${PN}-${PVR} installed in" 535 ewarn "${PN}-${PVR} installed in"
547 ewarn 536 ewarn
548 ewarn " $x" 537 ewarn " ${x}"
549 ewarn 538 ewarn
550 else 539 else
551 # we have enough information to remove the virtual copy ourself 540 # we have enough information to remove the virtual copy ourself
552 541
553 webapp-config -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} 542 ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR}
554 543
555 # if the removal fails - we carry on anyway! 544 # if the removal fails - we carry on anyway!
556 fi 545 fi
557 # IFS=" "
558 done 546 done
559
560 # IFS="$OLD_IFS"
561} 547}

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

  ViewVC Help
Powered by ViewVC 1.1.20