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

Diff of /eclass/webapp.eclass

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

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

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.48

  ViewVC Help
Powered by ViewVC 1.1.20