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

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

  ViewVC Help
Powered by ViewVC 1.1.20