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

Diff of /eclass/webapp.eclass

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

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

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.41

  ViewVC Help
Powered by ViewVC 1.1.20