projects / freeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 9e77fe1)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 23 Dec 2014 20:19:30 +0000 (12:19 -0800)
committerIvan Kohler <ivan@freeside.biz>
Tue, 23 Dec 2014 20:19:30 +0000 (12:19 -0800)
Makefile patch | blob | history
httemplate/docs/index.html [deleted file] patch | blob | history
rpm/freeside.spec patch | blob | history

diff --git a/Makefile b/Makefile
index 271a361..67bf83c 100644 (file)
--- 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 (file)
index 3b419de..0000000
--- a/httemplate/docs/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<head>
-  <title>Freeside Documentation</title>
-</head>
-<body bgcolor="#ffffff">
-  <h1>Freeside Documentation</h1>
-<img src="overview-new.png">
-<h3>Installation and upgrades</h3>
-<ul>
-  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Installation">New Installation</a>
-  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:RT_Installation">Installing integrated RT ticketing</a>
-  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Self-Service_Installation">Signup/Self-service installation</a>
-  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Upgrading">Upgrading from 1.5.8 or 1.6.X</a>
-</ul>
-<h3>Configuration and setup</h3>
-<ul>
-<!--
-  <li><a href="config.html">Configuration files</a>
-!-->
-  <li><a href="admin.html">Administration</a>
-<!--
-  <li><a href="../index.html#admin">Administration</a>
-!-->
-  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Administration#Exports_.28provisioning.29">Exports</a>
-  <li><a href="http://www.sisd.com/mediawiki/index.php/Freeside:1.7:Documentation:Administration#Billing">Billing</a>
-</ul>
-<h3>Developer</h3>
-<ul>
-  <li><a href="schema.html">Schema reference</a>
-  <li><a href="man/FS.html">Perl API</a>
-  <li><a href="legacy.html">Importing legacy data</a>
-</ul>
-</body>
diff --git a/rpm/freeside.spec b/rpm/freeside.spec
index 548444e..bac6ff8 100644 (file)
--- 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
Freeside billing, trouble ticketing, network monitoring and provisioning