Update Fledge branch

Author: MarkRiddoch

README.rst

@@ -1,13 +1,13 @@
 
 .. Links
-.. _main repository: https://github.com/foglamp/FogLAMP
+.. _main repository: https://github.com/fledge/Fledge
 
 
 *****************************
-Packaging Project for FogLAMP
+Packaging Project for Fledge
 *****************************
 
-This repo contains the scripts used to create a FogLAMP package.
+This repo contains the scripts used to create a Fledge package.
 
 We have separated the package build from the `main repository`_ in order to provide a more flexible packaging and to maintain the smallest possible footprint of the main project, even in terms of source code and development.
 
@@ -37,7 +37,7 @@ The make_deb Script
 
   $ ./make_deb help
   make_deb [help|clean|cleanall]
-  This script is used to create the Debian package of FogLAMP
+  This script is used to create the Debian package of Fledge
   Arguments:
    help     - Display this help text
    clean    - Remove all the old versions saved in format .XXXX
@@ -58,22 +58,22 @@ The make_deb Script
 Building a Debian Package
 =========================
 
-First, make sure that FogLAMP is properly installed via ``make install`` somewhere on your environment (default is */usr/local/foglamp*).
+First, make sure that Fledge is properly installed via ``make install`` somewhere on your environment (default is */usr/local/fledge*).
 Finally, run the ``make_deb`` command and it will make as per ``arch``:
 
 .. code-block:: console
 
   $ ./make_deb
-  The package root directory is : /home/foglamp/foglamp-pkg
-  The FogLAMP directory is      : /usr/local/foglamp
-  The FogLAMP version is        : 1.6.0
-  The package will be built in  : /home/foglamp/foglamp-pkg/packages/Debian/build/x86_64
+  The package root directory is : /home/fledge/fledge-pkg
+  The Fledge directory is      : /usr/local/fledge
+  The Fledge version is        : 1.6.0
+  The package will be built in  : /home/fledge/fledge-pkg/packages/Debian/build/x86_64
   The architecture is set as    : x86_64
-  The package name is           : foglamp-1.6.0-x86_64
+  The package name is           : fledge-1.6.0-x86_64
 
   Populating the package...Done.
   Building the new package...
-  dpkg-deb: building package 'foglamp' in 'foglamp-1.6.0-x86_64.deb'.
+  dpkg-deb: building package 'fledge' in 'fledge-1.6.0-x86_64.deb'.
   Building Complete.
   $
   
@@ -83,35 +83,35 @@ The result will be:
 
   $ ls -l packages/Debian/build/x86_64
   total 564
-  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:35 foglamp-1.6.0-x86_64
-  -rw-r--r-- 1 foglamp foglamp 572742 Mar 23 17:35 foglamp-1.6.0-x86_64.deb
+  drwxrwxr-x 4 fledge fledge   4096 Mar 23 17:35 fledge-1.6.0-x86_64
+  -rw-r--r-- 1 fledge fledge 572742 Mar 23 17:35 fledge-1.6.0-x86_64.deb
   $
   
 If you execute the ``make_deb`` command again, you will see:
 
 .. code-block:: console
 
   $ ./make_deb
-  The package root directory is : /home/foglamp/foglamp-pkg
-  The FogLAMP directory is      : /usr/local/foglamp
-  The FogLAMP version is        : 1.6.0
-  The package will be built in  : /home/foglamp/foglamp-pkg/packages/Debian/build/x86_64
+  The package root directory is : /home/fledge/fledge-pkg
+  The Fledge directory is      : /usr/local/fledge
+  The Fledge version is        : 1.6.0
+  The package will be built in  : /home/fledge/fledge-pkg/packages/Debian/build/x86_64
   The architecture is set as    : x86_64
-  The package name is           : foglamp-1.6.0-x86_64
+  The package name is           : fledge-1.6.0-x86_64
 
-  Saving the old working environment as foglamp-1.6.0-x86_64.0001
+  Saving the old working environment as fledge-1.6.0-x86_64.0001
   Populating the package...Done.
-  Saving the old package as foglamp-1.6.0-x86_64.deb.0001
+  Saving the old package as fledge-1.6.0-x86_64.deb.0001
   Building the new package...
-  dpkg-deb: building package 'foglamp' in 'foglamp-1.6.0-x86_64.deb'.
+  dpkg-deb: building package 'fledge' in 'fledge-1.6.0-x86_64.deb'.
   Building Complete.
   $
   $ ls -l packages/Debian/build/x86_64
   total 1128
-  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:53 foglamp-1.6.0-x86_64
-  drwxrwxr-x 4 foglamp foglamp   4096 Mar 23 17:35 foglamp-1.6.0-x86_64.0001
-  -rw-r--r-- 1 foglamp foglamp 573080 Mar 23 17:54 foglamp-1.6.0-x86_64.deb
-  -rw-r--r-- 1 foglamp foglamp 572742 Mar 23 17:35 foglamp-1.6.0-x86_64.deb.0001
+  drwxrwxr-x 4 fledge fledge   4096 Mar 23 17:53 fledge-1.6.0-x86_64
+  drwxrwxr-x 4 fledge fledge   4096 Mar 23 17:35 fledge-1.6.0-x86_64.0001
+  -rw-r--r-- 1 fledge fledge 573080 Mar 23 17:54 fledge-1.6.0-x86_64.deb
+  -rw-r--r-- 1 fledge fledge 572742 Mar 23 17:35 fledge-1.6.0-x86_64.deb.0001
   $
    
 ... where the previous build is now marked with the suffix *.0001*.
@@ -123,7 +123,7 @@ The make_rpm Script
 
   $ ./make_rpm --help
   make_rpm help [clean|cleanall]
-  This script is used to create the RPM package of FogLAMP
+  This script is used to create the RPM package of Fledge
   Arguments:
    help     - Display this help text
    clean    - Remove all the old versions saved in format .XXXX
@@ -133,33 +133,33 @@ The make_rpm Script
 Building a RPM Package
 ======================
 
-First, make sure that FogLAMP is properly installed via ``make install`` somewhere on your environment (default is */usr/local/foglamp*).
+First, make sure that Fledge is properly installed via ``make install`` somewhere on your environment (default is */usr/local/fledge*).
 Next, *x86* is the only currently supported architecture for RedHat/Centos.
 Finally, run the ``make_rpm`` command:
 
 .. code-block:: console
 
   $ ./make_rpm
-  The package root directory is : /home/foglamp/repos/foglamp-pkg
-  The FogLAMP directory is      : /home/foglamp/foglamp
-  The FogLAMP version is        : 1.5.2
-  The package will be built in  : /home/foglamp/repos/foglamp-pkg/packages/rpmbuild/RPMS/x86_64
-  The package name is           : foglamp-1.5.2-1.x86_64
+  The package root directory is : /home/fledge/repos/fledge-pkg
+  The Fledge directory is      : /home/fledge/fledge
+  The Fledge version is        : 1.5.2
+  The package will be built in  : /home/fledge/repos/fledge-pkg/packages/rpmbuild/RPMS/x86_64
+  The package name is           : fledge-1.5.2-1.x86_64
 
-  Saving the old working environment as foglamp-1.5.2-1.x86_64.0077
+  Saving the old working environment as fledge-1.5.2-1.x86_64.0077
   Populating the package and updating version in control file...Done.
   Prepare data directory
-  Saving the old package as foglamp-1.5.2-1.x86_64.rpm.0001
+  Saving the old package as fledge-1.5.2-1.x86_64.rpm.0001
   Building the new package...
-  Processing files: foglamp-1.5.2-1.x86_64
-  Provides: foglamp = 1.5.2-1 foglamp(x86-64) = 1.5.2-1
+  Processing files: fledge-1.5.2-1.x86_64
+  Provides: fledge = 1.5.2-1 fledge(x86-64) = 1.5.2-1
   Requires(interp): /bin/sh /bin/sh /bin/sh
   Requires(rpmlib): rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1
   Requires(pre): /bin/sh
   Requires(post): /bin/sh
   Requires(preun): /bin/sh
-  Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/foglamp/repos/foglamp-pkg/packages/rpmbuild/BUILDROOT/foglamp-1.5.2-1.x86_64
-  Wrote: /home/foglamp/repos/foglamp-pkg/packages/rpmbuild/RPMS/x86_64/foglamp-1.5.2-1.x86_64.rpm
+  Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/fledge/repos/fledge-pkg/packages/rpmbuild/BUILDROOT/fledge-1.5.2-1.x86_64
+  Wrote: /home/fledge/repos/fledge-pkg/packages/rpmbuild/RPMS/x86_64/fledge-1.5.2-1.x86_64.rpm
   Building Complete.
   $
 
@@ -169,39 +169,39 @@ The result will be:
 
   $ ls -l packages/rpmbuild/RPMS/x86_64
   total 6444
-  -rw-rw-r-- 1 foglamp foglamp 6597376 May 10 02:08 foglamp-1.5.2-1.x86_64.rpm
+  -rw-rw-r-- 1 fledge fledge 6597376 May 10 02:08 fledge-1.5.2-1.x86_64.rpm
   $
 
 If you execute the ``make_rpm`` command again, you will see:
 
 .. code-block:: console
 
   $ ./make_rpm
-  The package root directory is : /home/foglamp/repos/foglamp-pkg
-  The FogLAMP directory is      : /home/foglamp/foglamp
-  The FogLAMP version is        : 1.5.2
-  The package will be built in  : /home/foglamp/repos/foglamp-pkg/packages/rpmbuild/RPMS/x86_64
-  The package name is           : foglamp-1.5.2-1.x86_64
+  The package root directory is : /home/fledge/repos/fledge-pkg
+  The Fledge directory is      : /home/fledge/fledge
+  The Fledge version is        : 1.5.2
+  The package will be built in  : /home/fledge/repos/fledge-pkg/packages/rpmbuild/RPMS/x86_64
+  The package name is           : fledge-1.5.2-1.x86_64
 
-  Saving the old working environment as foglamp-1.5.2-1.x86_64.0079
+  Saving the old working environment as fledge-1.5.2-1.x86_64.0079
   Populating the package and updating version in control file...Done.
   Prepare data directory
-  Saving the old package as foglamp-1.5.2-1.x86_64.rpm.0001
+  Saving the old package as fledge-1.5.2-1.x86_64.rpm.0001
   Building the new package...
-  Processing files: foglamp-1.5.2-1.x86_64
-  Provides: foglamp = 1.5.2-1 foglamp(x86-64) = 1.5.2-1
+  Processing files: fledge-1.5.2-1.x86_64
+  Provides: fledge = 1.5.2-1 fledge(x86-64) = 1.5.2-1
   Requires(interp): /bin/sh /bin/sh /bin/sh
   Requires(rpmlib): rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 rpmlib(CompressedFileNames) <= 3.0.4-1
   Requires(pre): /bin/sh
   Requires(post): /bin/sh
   Requires(preun): /bin/sh
-  Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/foglamp/repos/foglamp-pkg/packages/rpmbuild/BUILDROOT/foglamp-1.5.2-1.x86_64
-  Wrote: /home/foglamp/repos/foglamp-pkg/packages/rpmbuild/RPMS/x86_64/foglamp-1.5.2-1.x86_64.rpm
+  Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/fledge/repos/fledge-pkg/packages/rpmbuild/BUILDROOT/fledge-1.5.2-1.x86_64
+  Wrote: /home/fledge/repos/fledge-pkg/packages/rpmbuild/RPMS/x86_64/fledge-1.5.2-1.x86_64.rpm
   Building Complete.
   $ ls -l packages/rpmbuild/RPMS/x86_64
   total 12888
-  -rw-rw-r-- 1 foglamp foglamp 6597420 May 10 02:10 foglamp-1.5.2-1.x86_64.rpm
-  -rw-rw-r-- 1 foglamp foglamp 6597376 May 10 02:08 foglamp-1.5.2-1.x86_64.rpm.0001
+  -rw-rw-r-- 1 fledge fledge 6597420 May 10 02:10 fledge-1.5.2-1.x86_64.rpm
+  -rw-rw-r-- 1 fledge fledge 6597376 May 10 02:08 fledge-1.5.2-1.x86_64.rpm.0001
   $
 
 ... where the previous build is now marked with the suffix *.0001*.

docker/Dockerfile

@@ -2,35 +2,35 @@ FROM ubuntu:18.04
 
 MAINTAINER Vaibhav Singhal "[email protected]"
 
-ARG FOGLAMP_BRANCH=master
-ENV FOGLAMP_BRANCH ${FOGLAMP_BRANCH}
+ARG FLEDGE_BRANCH=master
+ENV FLEDGE_BRANCH ${FLEDGE_BRANCH}
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y git rsyslog
 
-WORKDIR /foglamp-core
+WORKDIR /fledge-core
 
-RUN git clone --single-branch -b $FOGLAMP_BRANCH https://github.com/foglamp/FogLAMP.git 
+RUN git clone --single-branch -b $FLEDGE_BRANCH https://github.com/fledge/Fledge.git 
 
-RUN cd FogLAMP && \
+RUN cd Fledge && \
 	chmod +x requirements.sh && \
 	./requirements.sh && \
 	make install
 
 RUN echo "service rsyslog start" > start.sh && \
-	echo "/usr/local/foglamp/bin/foglamp start" >> start.sh && \
+	echo "/usr/local/fledge/bin/fledge start" >> start.sh && \
 	echo "tail -f /dev/null" >> start.sh && \
 	chmod +x start.sh
 
 
-ENV FOGLAMP_ROOT=/usr/local/foglamp
+ENV FLEDGE_ROOT=/usr/local/fledge
 
-VOLUME /usr/local/foglamp/data
+VOLUME /usr/local/fledge/data
 
 # These Volumes will be used in future when we want to install plugins
-VOLUME /usr/local/foglamp
-VOLUME /foglamp-core/FogLAMP
+VOLUME /usr/local/fledge
+VOLUME /fledge-core/Fledge
 
 EXPOSE 8081 1995
 
-CMD ["bash", "/foglamp-core/start.sh"]
+CMD ["bash", "/fledge-core/start.sh"]
 

docker/README.md

@@ -19,33 +19,33 @@ https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/
 	sudo systemctl daemon-reload
 	sudo systemctl restart docker
 ```
-### Build foglamp image
+### Build fledge image
 
 ```
-	docker build --tag foglamp --build-arg FOGLAMP_BRANCH=develop .
+	docker build --tag fledge --build-arg FLEDGE_BRANCH=develop .
 ```
 
-where name of the image is foglamp, FOGLAMP_BRANCH is the branch to build (develop, master, 1.5.2 ,etc)
+where name of the image is fledge, FLEDGE_BRANCH is the branch to build (develop, master, 1.5.2 ,etc)
 
 ### Run container
 
 
 ```
-    $ docker run -d -v /foglamp-data:/usr/local/foglamp/data --name foglamp -p 8081:8081 -p 1995:1995 foglamp 
+    $ docker run -d -v /fledge-data:/usr/local/fledge/data --name fledge -p 8081:8081 -p 1995:1995 fledge 
 ```
 
-	-d : run foglamp container in detached mode
-	-v : maps host volume /foglamp-data to container volume /usr/local/foglamp/data
-	--name : name of the container (foglamp)
+	-d : run fledge container in detached mode
+	-v : maps host volume /fledge-data to container volume /usr/local/fledge/data
+	--name : name of the container (fledge)
 	-p : map the port of host machine (8081) and container (:8081)
-	foglamp : name of the image created in earlier step
+	fledge : name of the image created in earlier step
 
-> To attach to a running conatiner: `docker exec -it foglamp bash`
+> To attach to a running conatiner: `docker exec -it fledge bash`
 
 
 ### Stopping docker container
 ```
-    $ docker stop foglamp
+    $ docker stop fledge
 ```
 
-> Note: The files in foglamp-data directory are created by container which creates/runs them as root user. In order to read the foglamp.db, you need to change the permission of foglamp.db* files, sudo chmod 666 foglamp.db* 
+> Note: The files in fledge-data directory are created by container which creates/runs them as root user. In order to read the fledge.db, you need to change the permission of fledge.db* files, sudo chmod 666 fledge.db* 

make_deb

@@ -23,7 +23,7 @@
 set -e
 
 usage="$(basename "$0") [help|clean|cleanall]
-This script is used to create the Debian package of FogLAMP
+This script is used to create the Debian package of Fledge
 Arguments:
  help	  - Display this help text
  clean    - Remove all the old versions saved in format .XXXX
@@ -66,28 +66,28 @@ do
   esac
 done
 
-# Check FOGLAMP_ROOT
-if [ -z ${FOGLAMP_ROOT+x} ]; then
-    # Set FOGLAMP_ROOT as the default directory
-    if [ -d "/usr/local/foglamp" ]; then
-      FOGLAMP_ROOT="/usr/local/foglamp"
-      export FOGLAMP_ROOT
+# Check FLEDGE_ROOT
+if [ -z ${FLEDGE_ROOT+x} ]; then
+    # Set FLEDGE_ROOT as the default directory
+    if [ -d "/usr/local/fledge" ]; then
+      FLEDGE_ROOT="/usr/local/fledge"
+      export FLEDGE_ROOT
     else
-      echo "No FOGLAMP_ROOT directory found - Program exit."
+      echo "No FLEDGE_ROOT directory found - Program exit."
       exit 1
     fi
 fi
 
-version=`cat ${FOGLAMP_ROOT}/VERSION | tr -d ' ' | grep 'foglamp_version=' | head -1 | sed -e 's/\(.*\)=\(.*\)/\2/g'`
+version=`cat ${FLEDGE_ROOT}/VERSION | tr -d ' ' | grep 'fledge_version=' | head -1 | sed -e 's/\(.*\)=\(.*\)/\2/g'`
 BUILD_ROOT="${GIT_ROOT}/packages/Debian/build/${architecture}"
 
 # Final package name
-package_name="foglamp-${version}-${architecture}"
+package_name="fledge-${version}-${architecture}"
 
 # Print the summary of findings
 echo "The package root directory is : ${GIT_ROOT}"
-echo "The FogLAMP directory is      : ${FOGLAMP_ROOT}"
-echo "The FogLAMP version is        : ${version}"
+echo "The Fledge directory is      : ${FLEDGE_ROOT}"
+echo "The Fledge version is        : ${version}"
 echo "The package will be built in  : ${BUILD_ROOT}"
 echo "The architecture is set as    : ${architecture}"
 echo "The package name is           : ${package_name}"
@@ -118,9 +118,9 @@ cd "${package_name}"
 cp -R ${GIT_ROOT}/packages/Debian/common/* .
 cp -R ${GIT_ROOT}/packages/Debian/${architecture}/* .
 sed -i "s/Version: 1.0.0/Version: ${version}/g" DEBIAN/control
-mkdir -p usr/local/foglamp
-cd usr/local/foglamp
-cp -R ${FOGLAMP_ROOT}/* .
+mkdir -p usr/local/fledge
+cd usr/local/fledge
+cp -R ${FLEDGE_ROOT}/* .
 echo "Done."
 
 # Prepare new data directory
@@ -129,14 +129,14 @@ mv data data.new
 cd data.new
 rm -rf core.err
 rm -rf etc/certs/*
-rm -rf foglamp.db
+rm -rf fledge.db
 rm -rf var
 
 # Add customised files
-#echo -n "Adding FogLAMP customization..."
+#echo -n "Adding Fledge customization..."
 
 #cp -R ${GIT_ROOT}/share/* share/postgresql/.
-#cd ${BUILD_ROOT}/${package_name}/usr/local/foglamp/plugins/storage/postgres
+#cd ${BUILD_ROOT}/${package_name}/usr/local/fledge/plugins/storage/postgres
 #mkdir bin
 #cp ${GIT_ROOT}/scripts/* bin/.
 #echo "Done."