From 277082b67c8ae6a0833eb651984e75797bb0d56a Mon Sep 17 00:00:00 2001 From: sko Date: Mon, 19 Feb 2018 14:47:18 +0100 Subject: [PATCH 1/4] remove ntp and ufw from package list both are unrelated to emoncms functionality; also see: https://community.openenergymonitor.org/t/install-dependencies/6530/36 and related commit #6eddfdd1ee6111607a5bbb4d14502dc8c8951381 https://github.com/emoncms/emoncms/commit/6eddfdd1ee6111607a5bbb4d14502dc8c8951381 --- docs/LinuxInstall.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/LinuxInstall.md b/docs/LinuxInstall.md index 53e646f67..d0128dc34 100644 --- a/docs/LinuxInstall.md +++ b/docs/LinuxInstall.md @@ -10,11 +10,11 @@ You may need to start by updating the system repositories **For Ubuntu 14.04:** - sudo apt-get install apache2 mysql-server mysql-client php5 libapache2-mod-php5 php5-mysql php5-curl php-pear php5-dev php5-mcrypt php5-json git-core redis-server build-essential ufw ntp -y + sudo apt-get install apache2 mysql-server mysql-client php5 libapache2-mod-php5 php5-mysql php5-curl php-pear php5-dev php5-mcrypt php5-json git-core redis-server build-essential -y **For Ubuntu 16.04:** - sudo apt-get install apache2 mysql-server mysql-client php libapache2-mod-php php-mysql php-curl php-pear php-dev php-mcrypt php-json git-core redis-server build-essential ufw ntp -y + sudo apt-get install apache2 mysql-server mysql-client php libapache2-mod-php php-mysql php-curl php-pear php-dev php-mcrypt php-json git-core redis-server build-essential -y ### Install PHP pecl dependencies From 70e371653922ff4c3a5935be92e9b83a6cae33f0 Mon Sep 17 00:00:00 2001 From: sko Date: Mon, 19 Feb 2018 14:51:42 +0100 Subject: [PATCH 2/4] clean up sudo-code - instead of typing sudo a dozend times for essentially one task, just become root and exit afterwards. - use a single 'cat' instead of multiple echoes - this makes it _much_ easier to extract the actual configuration for manual setup on other OSes. - remove manual linking of the site configuration from site-available to site-enabled; that's the job of 'a2ensite' (see a2ensite manual page) --- docs/LinuxInstall.md | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/docs/LinuxInstall.md b/docs/LinuxInstall.md index d0128dc34..b0eacade1 100644 --- a/docs/LinuxInstall.md +++ b/docs/LinuxInstall.md @@ -38,18 +38,21 @@ You may need to start by updating the system repositories Emoncms uses a front controller to route requests, modrewrite needs to be configured: ``` - sudo a2enmod rewrite - sudo sh -c "echo '' >> /etc/apache2/sites-available/emoncms.conf" - sudo sh -c "echo ' Options FollowSymLinks' >> /etc/apache2/sites-available/emoncms.conf" - sudo sh -c "echo ' AllowOverride All' >> /etc/apache2/sites-available/emoncms.conf" - sudo sh -c "echo ' DirectoryIndex index.php' >> /etc/apache2/sites-available/emoncms.conf" - sudo sh -c "echo ' Order allow,deny' >> /etc/apache2/sites-available/emoncms.conf" - sudo sh -c "echo ' Allow from all' >> /etc/apache2/sites-available/emoncms.conf" - sudo sh -c "echo '' >> /etc/apache2/sites-available/emoncms.conf" - sudo sh -c "echo 'ServerName localhost' >> /etc/apache2/apache2.conf" - sudo ln -s /etc/apache2/sites-available/emoncms.conf /etc/apache2/sites-enabled/ - sudo a2ensite emoncms - sudo service apache2 reload + sudo su + a2enmod rewrite + cat <> /etc/apache2/sites-available/emoncms.conf + + Options FollowSymLinks + AllowOverride All + DirectoryIndex index.php + Order allow,deny + Allow from all + + EOF + echo 'ServerName localhost' >> /etc/apache2/apache2.conf + a2ensite emoncms + service apache2 reload + exit ``` ## Install Emoncms @@ -100,13 +103,15 @@ Exit mysql by: ### Create data repositories for emoncms feed engines - sudo mkdir /var/lib/phpfiwa - sudo mkdir /var/lib/phpfina - sudo mkdir /var/lib/phptimeseries + sudo su + mkdir /var/lib/phpfiwa + mkdir /var/lib/phpfina + mkdir /var/lib/phptimeseries - sudo chown www-data:root /var/lib/phpfiwa - sudo chown www-data:root /var/lib/phpfina - sudo chown www-data:root /var/lib/phptimeseries + chown www-data:root /var/lib/phpfiwa + chown www-data:root /var/lib/phpfina + chown www-data:root /var/lib/phptimeseries + exit ## Setup Emoncms settings From 0a9e6cb3c60e2a59c2bab8b1b1f5cbddee30710b Mon Sep 17 00:00:00 2001 From: Sebastian Oswald Date: Tue, 20 Feb 2018 18:43:58 +0100 Subject: [PATCH 3/4] revert usage of `sudo su` as suggested by review in PR #807 --- docs/LinuxInstall.md | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/docs/LinuxInstall.md b/docs/LinuxInstall.md index b0eacade1..c8cda74e2 100644 --- a/docs/LinuxInstall.md +++ b/docs/LinuxInstall.md @@ -38,9 +38,8 @@ You may need to start by updating the system repositories Emoncms uses a front controller to route requests, modrewrite needs to be configured: ``` - sudo su - a2enmod rewrite - cat <> /etc/apache2/sites-available/emoncms.conf + sudo a2enmod rewrite + sudo cat <> /etc/apache2/sites-available/emoncms.conf Options FollowSymLinks AllowOverride All @@ -49,10 +48,9 @@ Emoncms uses a front controller to route requests, modrewrite needs to be config Allow from all EOF - echo 'ServerName localhost' >> /etc/apache2/apache2.conf - a2ensite emoncms - service apache2 reload - exit + sudo echo 'ServerName localhost' >> /etc/apache2/apache2.conf + sudo a2ensite emoncms + sudo service apache2 reload ``` ## Install Emoncms @@ -103,15 +101,13 @@ Exit mysql by: ### Create data repositories for emoncms feed engines - sudo su - mkdir /var/lib/phpfiwa - mkdir /var/lib/phpfina - mkdir /var/lib/phptimeseries + sudo mkdir /var/lib/phpfiwa + sudo mkdir /var/lib/phpfina + sudo mkdir /var/lib/phptimeseries - chown www-data:root /var/lib/phpfiwa - chown www-data:root /var/lib/phpfina - chown www-data:root /var/lib/phptimeseries - exit + sudo chown www-data:root /var/lib/phpfiwa + sudo chown www-data:root /var/lib/phpfina + sudo chown www-data:root /var/lib/phptimeseries ## Setup Emoncms settings From d0a0cbde7bcbbf3ce1804464d5c2c4450e2ab916 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 20 Feb 2018 19:26:19 +0000 Subject: [PATCH 4/4] Change tabs to spaces Remove leading whitespace from heredoc commands. Replace tab indents with spaces, because tab indents cause errors unless the heredoc operator is changed to permit tab indents. Are these minor changes OK with you Sebastian? --- docs/LinuxInstall.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/LinuxInstall.md b/docs/LinuxInstall.md index c8cda74e2..d9bdadbf3 100644 --- a/docs/LinuxInstall.md +++ b/docs/LinuxInstall.md @@ -38,19 +38,19 @@ You may need to start by updating the system repositories Emoncms uses a front controller to route requests, modrewrite needs to be configured: ``` - sudo a2enmod rewrite - sudo cat <> /etc/apache2/sites-available/emoncms.conf - - Options FollowSymLinks - AllowOverride All - DirectoryIndex index.php - Order allow,deny - Allow from all - - EOF - sudo echo 'ServerName localhost' >> /etc/apache2/apache2.conf - sudo a2ensite emoncms - sudo service apache2 reload +sudo a2enmod rewrite +sudo cat <> /etc/apache2/sites-available/emoncms.conf + + Options FollowSymLinks + AllowOverride All + DirectoryIndex index.php + Order allow,deny + Allow from all + +EOF +sudo echo 'ServerName localhost' >> /etc/apache2/apache2.conf +sudo a2ensite emoncms +sudo service apache2 reload ``` ## Install Emoncms