From: kupcevic@sourceware.org <kupcevic@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile ...
Date: 5 Oct 2006 15:01:41 -0000 [thread overview]
Message-ID: <20061005150141.27745.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-10-05 15:01:40
Modified files:
luci/cluster : Makefile
luci/homebase : Makefile
luci/init.d : luci
luci/plone-custom: Makefile
luci/storage : Makefile
Log message:
luci Data.fs import/export scripts:
- skip Makefile*
- define LUCI_HOST
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- conga/luci/cluster/Makefile 2006/08/16 14:59:56 1.5
+++ conga/luci/cluster/Makefile 2006/10/05 15:01:39 1.6
@@ -1,7 +1,8 @@
+LUCI_HOST=luci
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=luci:8021
-LUCI_HTTP=http://luci:8080/luci
+LUCI_FTP=$(LUCI_HOST):8021
+LUCI_HTTP=http://$(LUCI_HOST):8080/luci
all:
@true
@@ -11,7 +12,7 @@
@if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ $(FILES) ; \
else \
- find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ ; \
+ find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ ; \
fi
export:
--- conga/luci/homebase/Makefile 2006/08/16 14:59:56 1.5
+++ conga/luci/homebase/Makefile 2006/10/05 15:01:39 1.6
@@ -1,7 +1,8 @@
+LUCI_HOST=luci
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=luci:8021
-LUCI_HTTP=http://luci:8080/luci
+LUCI_FTP=$(LUCI_HOST):8021
+LUCI_HTTP=http://$(LUCI_HOST):8080/luci
all:
@true
@@ -11,7 +12,7 @@
@if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ $(FILES) ; \
else \
- find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ ; \
+ find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ ; \
fi
export:
--- conga/luci/init.d/luci 2006/10/03 18:23:30 1.10
+++ conga/luci/init.d/luci 2006/10/05 15:01:39 1.11
@@ -32,7 +32,7 @@
LUCI_USER="luci"
LUCI_GROUP="luci"
-LUCI_URL="https://$HOSTNAME:$LUCI_HTTPS_PORT"
+LUCI_URL="https://`/bin/hostname`:$LUCI_HTTPS_PORT"
HTTPS_PUBKEY="/var/lib/luci/var/certs/https.pem"
HTTPS_PRIVKEY="/var/lib/luci/var/certs/https.key.pem"
--- conga/luci/plone-custom/Makefile 2006/08/16 14:59:56 1.2
+++ conga/luci/plone-custom/Makefile 2006/10/05 15:01:40 1.3
@@ -1,7 +1,8 @@
+LUCI_HOST=luci
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=luci:8021
-LUCI_HTTP=http://luci:8080/luci
+LUCI_FTP=$(LUCI_HOST):8021
+LUCI_HTTP=http://$(LUCI_HOST):8080/luci
all:
@true
@@ -11,7 +12,7 @@
@if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/portal_skins/custom/ $(FILES) ; \
else \
- find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -not -name custom.xml -not -name README -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/portal_skins/custom/ ; \
+ find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -not -name custom.xml -not -name README -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/portal_skins/custom/ ; \
fi
export:
--- conga/luci/storage/Makefile 2006/08/16 14:59:56 1.5
+++ conga/luci/storage/Makefile 2006/10/05 15:01:40 1.6
@@ -1,7 +1,8 @@
+LUCI_HOST=luci
LUCI_USER=admin
LUCI_PASS=changeme
-LUCI_FTP=luci:8021
-LUCI_HTTP=http://luci:8080/luci
+LUCI_FTP=$(LUCI_HOST):8021
+LUCI_HTTP=http://$(LUCI_HOST):8080/luci
all:
@true
@@ -11,7 +12,7 @@
@if test "$(FILES)"; then \
../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ $(FILES) ; \
else \
- find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ ; \
+ find . -follow -maxdepth 1 -type f -not -name "Makefile*" -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ ; \
fi
export:
next reply other threads:[~2006-10-05 15:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-05 15:01 kupcevic [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-08-16 14:59 [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile rmccabe
2006-07-14 20:08 rmccabe
2006-07-14 20:01 rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061005150141.27745.qmail@sourceware.org \
--to=kupcevic@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).