Let me know what else you plan to add to it. This only contains what I saw as an issue (when I opened it in IDEA, I'm sure other IDEs will have more settings). Since the build of the site doesn't generate any output files (the content/generated HTML are tracked in SCM), nothing really needs to be tracked from that POV.
John On Sat, Nov 12, 2016 at 9:23 AM sebb <[email protected]> wrote: > Reading around it seems that .gitignore should be tracked in the repo, > so I will update it. > > On 12 November 2016 at 13:17, sebb <[email protected]> wrote: > > Adding .gitignore is not really part of the PR. > > > > Is it normal to add .gitignore to the git repo? > > If so, then it ought to be complete. > > > > > > > > On 12 November 2016 at 03:56, <[email protected]> wrote: > >> Repository: incubator-ponymail > >> Updated Branches: > >> refs/heads/master 0ccaa0c10 -> 522fba00c > >> > >> > >> #240 Clean up the ubuntu docs. > >> > >> > >> Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo > >> Commit: > http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/522fba00 > >> Tree: > http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/522fba00 > >> Diff: > http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/522fba00 > >> > >> Branch: refs/heads/master > >> Commit: 522fba00cdb55d1abe37c0c2862f6f2831090c6a > >> Parents: 0ccaa0c > >> Author: John D. Ament <[email protected]> > >> Authored: Fri Nov 11 22:55:16 2016 -0500 > >> Committer: John D. Ament <[email protected]> > >> Committed: Fri Nov 11 22:55:16 2016 -0500 > >> > >> ---------------------------------------------------------------------- > >> .gitignore | 2 ++ > >> docs/INSTALL.ubuntu.md | 20 +++++++++----------- > >> 2 files changed, 11 insertions(+), 11 deletions(-) > >> ---------------------------------------------------------------------- > >> > >> > >> > http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/522fba00/.gitignore > >> ---------------------------------------------------------------------- > >> diff --git a/.gitignore b/.gitignore > >> new file mode 100644 > >> index 0000000..29b636a > >> --- /dev/null > >> +++ b/.gitignore > >> @@ -0,0 +1,2 @@ > >> +.idea > >> +*.iml > >> \ No newline at end of file > >> > >> > http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/522fba00/docs/INSTALL.ubuntu.md > >> ---------------------------------------------------------------------- > >> diff --git a/docs/INSTALL.ubuntu.md b/docs/INSTALL.ubuntu.md > >> index cda8aa7..4d0b948 100644 > >> --- a/docs/INSTALL.ubuntu.md > >> +++ b/docs/INSTALL.ubuntu.md > >> @@ -23,25 +23,23 @@ sudo pip3 install elasticsearch formatflowed netaddr > >> Install ElasticSearch: > >> > >> ~~~ > >> -sudo apt-get default-jre-headless > >> wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo > apt-key add - > >> echo "deb http://packages.elastic.co/elasticsearch/2.x/debian stable > main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch-2.x.list > >> -sudo apt-get update && sudo apt-get install elasticsearch > >> +sudo apt-get update && sudo apt-get install elasticsearch > default-jre-headless > >> ~~~ > >> > >> Compile and install mod_lua if necessary (httpd < 2.4.17 on Ubuntu): > >> ~~~ > >> -apt-get install apache2-dev > >> +sudo apt-get install apache2-dev > >> svn co > https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/modules/lua/ > >> cd lua/ > >> -apxs -I/usr/include/lua5.2 -cia mod_lua.c lua_*.c -lm -llua5.2 > >> +sudo apxs -I/usr/include/lua5.2 -cia mod_lua.c lua_*.c -lm -llua5.2 > >> ~~~ > >> > >> > >> Check out a copy of Pony Mail: > >> ~~~ > >> -cd /var/www > >> -git clone https://github.com/apache/incubator-ponymail.git > >> +sudo git clone https://github.com/apache/incubator-ponymail.git > /var/www/ponymail > >> ~~~ > >> > >> Configure Elasticsearch to automatically start during bootup. For > Ubuntu <= 14.10: > >> @@ -60,7 +58,7 @@ sudo /bin/systemctl enable elasticsearch.service > >> Start up ElasticSearch: > >> > >> ~~~ > >> -service elasticsearch start > >> +sudo service elasticsearch start > >> ~~~ > >> > >> Set up Pony Mail: > >> @@ -71,9 +69,9 @@ sudo python3 setup.py > >> ~~~ > >> > >> > >> -Set up Apache httpd by adding, for example, the following virtual host > configuration: > >> +Set up Apache httpd by adding, for example, the following virtual host > configuration (e.g. in `/etc/apache2/sites-enabled/000-default.conf`): > >> > >> -~~~ > >> +``` > >> <VirtualHost *:80> > >> ServerName mylists.foo.tld > >> DocumentRoot /var/www/ponymail/site > >> @@ -82,9 +80,9 @@ Set up Apache httpd by adding, for example, the > following virtual host configura > >> LuaCodeCache stat > >> AcceptPathInfo On > >> </VirtualHost> > >> -~~~ > >> +``` > >> > >> -Enable mod_lua and start apache: > >> +Enable mod_lua and start apache, if not already enabled: > >> > >> ~~~ > >> sudo a2enmod lua > >> >
