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

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

  ViewVC Help
Powered by ViewVC 1.1.20