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

Diff of /eclass/webapp.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20