Nick Daly
e3f1297711
Unify git.sample.config and git.sample.fhs.config.
...
There's no point to having two copies of what's essentially the same
file. In the long term, this means the distributions will need to
patch out cfg.py directories instead of plinth.sample.fhs.config. So,
if diff plinth.sample.config plinth.sample.fhs.config reveals
anything relevant, put that in your patch.
2013-10-30 22:05:29 -05:00
Petter Reinholdtsen
6e1d144706
Add freedombox-setup script for plinth.
...
This allow us to handle all plinth setup in one package.
2013-10-19 09:05:36 +02:00
Nick Daly
025c2aebc1
Forgot an Apache module: proxy_http.
...
Without this module, Apache doesn't know how to proxy HTTP requests.
2013-10-18 17:03:27 -05:00
Nick Daly
ee5609a2e3
Configure Apache correctly when installing Plinth.
...
Apache configuration was missing a few modules, and the server needs
to be restarted after those modules are enabled. Also, the server
needs to be reloaded after the Plinth site is enabled.
2013-10-18 16:52:40 -05:00
Petter Reinholdtsen
80f39c545e
Fix install path and target for share/apache2/plinth.conf.
2013-10-07 09:09:12 +02:00
Petter Reinholdtsen
7c5cec57b4
Make sure 'make all' do not need privileges, and 'make install'
...
do not try to change stuff outside $(DESTDIR). This make
sure debian packaging is possible.
2013-10-07 09:00:26 +02:00
Nick Daly
a9c853e5bd
Merged with upstream.
2013-10-06 21:21:43 -05:00
Nick Daly
04d9abfba6
Updated Makefile to reflect Apache config changes.
2013-10-06 21:17:18 -05:00
Nick Daly
5de7ecc99b
Configure Apache by default.
2013-10-05 14:54:53 -05:00
James Valleroy
4048e77738
Fixes for plinth.config when run from source folder.
2013-09-28 18:04:53 -04:00
Nick Daly
6c988755ac
Merge pull request #30 from petterreinholdtsen/do-not-clean-vendor-destdir
...
Avoid removing vendor and $(DESTDIR).
2013-09-28 10:49:16 -07:00
Petter Reinholdtsen
55bf19865a
Avoid removing vendor and $(DESTDIR).
...
The vendor/ directory contain source used during build, and
$(DESTDIR) might point to /usr/. Neither should be removed
in the clean target.
2013-09-25 11:23:51 +02:00
Petter Reinholdtsen
444365ec78
Rewrite plinth to use sudo and action scripts instead of exmachina for privileged accesss.
2013-09-23 09:37:24 +02:00
Nick Daly
c99f074f22
Use ExMachina already in Plinth/vendor.
2013-09-15 21:55:23 -05:00
Nick Daly
87753531d2
Reverted change 657068b0.
2013-09-15 21:47:18 -05:00
Petter Reinholdtsen
6409552e70
Fix exmachine import.
2013-09-12 12:58:39 +02:00
Petter Reinholdtsen
657068b026
Import exmachina into plint, using source from Tom Galloway.
2013-09-12 11:05:08 +02:00
Nick Daly
ec9a457e3e
Merged: tzafrir's novendor patch.
...
Author: Tzafrir Cohen <tzafrir@debian.org>
Description: "vendor" packages are installed as separate system debs
2013-09-08 17:34:53 -05:00
Nick Daly
a97061055c
Merged: tzafrir's install_dir patch.
...
Author: Tzafrir Cohen <tzafrir@debian.org>
Description: These things are easier to install with dh
* Python modules: fighting with dh_python2 is tough
(it changes the /etc/ symlink, for isntance)
* Let's just install man pages ourselves for now.
* symlinks: with dh_link
2013-09-08 17:31:27 -05:00
Nick Daly
ce0d6a57e3
Included missing dependencies.
2013-09-08 15:07:18 -05:00
Nick Daly
3ab7d05bf3
Add hosting and auto-archive-creation.
...
The makefile has three new targets:
1. hosting: Publish repository and automagically build the archives to
serve to clients.
2. current-checkout.tar.gz: Create an archive of the current project
directory.
3. current-repository.tar.gz: Create an archive of the current project
directory along with the source repository metadata so that the
archive is a full checkout of the project.
2013-04-23 21:44:09 -05:00
Nick Daly
f55c7a48ea
Merged with James's upstream.
...
Hope I did it right. If I screwed up, withsqlite is borked.
2013-04-23 17:49:22 -05:00
Nick Daly
83cc3b4614
Build files are now stored in ./vendor/
2013-03-23 18:44:13 -05:00
James Vasile
1ddf4bede4
Adjust how modules are imported
...
* change to u. notation for util, since from foo import * is evil
* make import vendor.foo possible
* vendor dir is part of the repo now, no need to mkdir
* use the vendor.foo notation
2013-02-09 13:11:06 -05:00
James Vasile
ce34a5eaa8
bit of Makefile reorganization
2013-02-07 16:43:44 -05:00
James Vasile
c976b1a00c
adjust makefile to use submodules
2013-02-07 14:25:08 -05:00
James Vasile
f0fd63b544
add missing pieces to make uninstall
2013-02-07 12:55:43 -05:00
James Vasile
338a0684ba
quote the wildcards in rsync excludes
2013-02-07 12:22:45 -05:00
James Vasile
fdd1d04170
Don't set DESTDIR in the Makefile
...
See http://www.gnu.org/prep/standards/html_node/DESTDIR.html#DESTDIR
2013-02-07 11:38:49 -05:00
James Vasile
65fe8434e3
Fix paths in installed version
...
* Read python.config from script dir
* Make dirs for pid and run
Maybe making DESTDIR/var/run during make install is not needed because
we can expect the target system to have /var/run, but if it's missing
the CherryPy engine will fail when it tries to write the pid. So I
added it.
2013-02-07 11:30:37 -05:00
James Vasile
3a7f2bd860
no need to write a cherryp.config
2013-02-07 09:22:00 -05:00
James Vasile
63d2c3ee68
Makefile improvements
...
* Remove commented out git pull lines. We shouldn't update so automatically.
* Use rsync because it gives us --exclude
* Put docs where the webserver can find them
2013-02-07 06:21:45 -05:00
James Vasile
8440775141
put man page in place during make install
2013-02-07 06:06:35 -05:00
James Vasile
4371af4c12
silencing some things in Makefile
2013-02-06 22:41:09 -05:00
James Vasile
dc7dba26cf
copy sample config
2013-02-06 22:31:07 -05:00
James Vasile
2f4dd2642d
add docs to make un/install, handle a few unhandled things to install
2013-02-06 22:28:14 -05:00
James Vasile
d33f6c2997
add make uninstall target
2013-02-06 20:50:10 -05:00
James Vasile
e048871f28
add install target
2013-02-06 20:48:02 -05:00
James Vasile
fb3af15edd
remove cherrypy.cfg from default
2013-02-06 12:39:49 -05:00
James Vasile
2288b7804a
s/_DIR/DIR/
2013-02-06 09:00:19 -05:00
James Vasile
f6a9f4c0d5
add cherrypy3 to Makefile, clean up some git
2013-02-05 16:08:17 -05:00
James Vasile
a14727f2fc
pull withsqlite from github
2013-02-05 16:06:16 -05:00
James Vasile
028ab7fcfb
combine build and vendor dirs
2013-02-05 15:10:13 -05:00
Tom Galloway
b54a4906e6
Fix to allow hostname to be updated on Ubuntu. This needed a change to exmachina which I've created a pull request for. I've updated Make to point to my fork of exmachina until this has been merged, when it can be reverted.
2013-01-10 09:15:31 +00:00
Nick Daly
8e16374136
Commented out the extra bjsonrpc call.
2013-01-06 16:05:58 -06:00
Tom Galloway
b45d5cfe85
Extra predepend's, plinth doesn't need to run as root, pidfile location set in cfg file.
2013-01-04 12:50:51 +00:00
Tom Galloway
95118b3b96
Clean now uses BUILD_DIR variable.
2013-01-03 15:22:16 +00:00
Tom Galloway
076bf829e7
Extra predepend
2013-01-03 15:12:15 +00:00
Tom Galloway
b2c157ec1d
Added predepend packages and updated python path for build folders.
2013-01-03 15:08:06 +00:00
James Vasile
dcd36e1b94
cfg.py shouldn't overwrite local config on update
2012-02-19 15:07:14 -05:00
