From: Ivan Kohler Date: Tue, 23 Dec 2014 20:19:30 +0000 (-0800) Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2fc2924eeebcd3951cbf862da44729187f35ca8d;hp=9e77fe17c8a593f45ffd7df5b2611ae908c4345d Merge branch 'master' of git.freeside.biz:/home/git/freeside --- diff --git a/Makefile b/Makefile index 271a36115..67bf83c09 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ RT_ENABLED = 1 RT_DOMAIN = example.com RT_TIMEZONE = US/Pacific #RT_TIMEZONE = US/Eastern -FREESIDE_URL = "http://localhost/freeside/" +FREESIDE_URL = "http://192.168.1.6/freeside/" #for now, same db as specified in DATASOURCE... eventually, otherwise? RT_DB_DATABASE = freeside @@ -460,7 +460,7 @@ release: #cd /home/ivan git archive --prefix=freeside-${VERSION}/ ${TAG} | gzip -9 >freeside-${VERSION}.tar.gz - scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/ + scp freeside-${VERSION}.tar.gz ivan@freeside.biz:/var/www/www.freeside.biz/freeside/ mv freeside-${VERSION}.tar.gz .. #these things failing should not make release target fail, so: "|| true" diff --git a/httemplate/docs/index.html b/httemplate/docs/index.html deleted file mode 100644 index 3b419de00..000000000 --- a/httemplate/docs/index.html +++ /dev/null @@ -1,32 +0,0 @@ - - Freeside Documentation - - -

Freeside Documentation

Installation and upgrades

Configuration and setup

Developer

- diff --git a/rpm/freeside.spec b/rpm/freeside.spec index 548444e12..bac6ff85d 100644 --- a/rpm/freeside.spec +++ b/rpm/freeside.spec @@ -8,9 +8,9 @@ Version: %{version} Release: %{release} License: AGPLv3 Group: Applications/Internet -URL: http://www.sisd.com/freeside/ +URL: http://www.freeside.biz/freeside/ Vendor: Freeside -Source: http://www.sisd.com/freeside/%{name}-%{version}.tar.gz +Source: http://www.freeside.biz/freeside/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: %{name}-frontend