nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed /etc/ebusd for changed config service URL

Browse Source
This commit is contained in:
john30
2018-04-04 10:18:32 +02:00
parent a36174c02f
commit 6ec3ef6e4c
5 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/archlinux/ebusd.install
Regular → Executable
+2 -4
View File
@@ -2,9 +2,7 @@ post_install() {
echo "Instructions:" echo "Instructions:"
echo "1. Edit /etc/conf.d/ebusd if necessary" echo "1. Edit /etc/conf.d/ebusd if necessary"
echo " (especially if your device is not /dev/ttyUSB0)" echo " (especially if your device is not /dev/ttyUSB0)"
echo "2. Place CSV configuration files in /etc/ebusd/" echo "2. To start the daemon, enter 'systemctl start ebusd'"
echo " (see https://github.com/john30/ebusd-configuration)" echo "3. Check the log file /var/log/ebusd.log"
echo "3. To start the daemon, enter 'systemctl start ebusd'"
echo "4. Check the log file /var/log/ebusd.log"
} }
contrib/docker/Dockerfile
Regular → Executable
-4
View File
@@ -28,10 +28,6 @@ WORKDIR /
RUN rm -rf /build RUN rm -rf /build
RUN mkdir -p /etc/ebusd \
&& curl -SL https://github.com/john30/ebusd-configuration/archive/master.tar.gz \
| tar xz --strip-components=3 -C /etc/ebusd ebusd-configuration-master/ebusd-2.1.x/de
EXPOSE 8888 EXPOSE 8888
COPY runtime/docker-entrypoint.sh / COPY runtime/docker-entrypoint.sh /
contrib/docker/release/Dockerfile
Regular → Executable
-3
View File
@@ -18,9 +18,6 @@ RUN dpkg -i ebusd.deb
RUN rm ebusd.deb RUN rm ebusd.deb
RUN curl -SL https://github.com/john30/ebusd-configuration/archive/master.tar.gz \
| tar xz --strip-components=3 -C /etc/ebusd ebusd-configuration-master/ebusd-2.1.x/de
EXPOSE 8888 EXPOSE 8888
COPY docker-entrypoint.sh / COPY docker-entrypoint.sh /
contrib/docker/runtime/Dockerfile
Regular → Executable
-3
View File
@@ -18,9 +18,6 @@ RUN dpkg -i ebusd.deb
RUN rm ebusd.deb RUN rm ebusd.deb
RUN curl -SL https://github.com/john30/ebusd-configuration/archive/master.tar.gz \
| tar xz --strip-components=3 -C /etc/ebusd ebusd-configuration-master/ebusd-2.1.x/de
EXPOSE 8888 EXPOSE 8888
COPY docker-entrypoint.sh / COPY docker-entrypoint.sh /
make_debian.sh
+7 -12
View File
@@ -83,7 +83,7 @@ echo "*************"
echo " pack" echo " pack"
echo "*************" echo "*************"
echo echo
mkdir -p $RELEASE/DEBIAN $RELEASE/etc/default $RELEASE/etc/ebusd $RELEASE/etc/logrotate.d || exit 1 mkdir -p $RELEASE/DEBIAN $RELEASE/etc/default $RELEASE/etc/logrotate.d || exit 1
rm $RELEASE/usr/bin/ebusfeed rm $RELEASE/usr/bin/ebusfeed
if [ -d /run/systemd/system ]; then if [ -d /run/systemd/system ]; then
mkdir -p $RELEASE/lib/systemd/system || exit 1 mkdir -p $RELEASE/lib/systemd/system || exit 1
@@ -93,7 +93,6 @@ else
cp contrib/debian/init.d/ebusd $RELEASE/etc/init.d/ebusd || exit 1 cp contrib/debian/init.d/ebusd $RELEASE/etc/init.d/ebusd || exit 1
fi fi
cp contrib/debian/default/ebusd $RELEASE/etc/default/ebusd || exit 1 cp contrib/debian/default/ebusd $RELEASE/etc/default/ebusd || exit 1
cp contrib/etc/ebusd/* $RELEASE/etc/ebusd/ || exit 1
cp contrib/etc/logrotate.d/ebusd $RELEASE/etc/logrotate.d/ || exit 1 cp contrib/etc/logrotate.d/ebusd $RELEASE/etc/logrotate.d/ || exit 1
cp ChangeLog.md $RELEASE/DEBIAN/changelog || exit 1 cp ChangeLog.md $RELEASE/DEBIAN/changelog || exit 1
cat <<EOF > $RELEASE/DEBIAN/control cat <<EOF > $RELEASE/DEBIAN/control
@@ -123,11 +122,9 @@ if [ -d /run/systemd/system ]; then
echo "Instructions:" echo "Instructions:"
echo "1. Edit /etc/default/ebusd if necessary" echo "1. Edit /etc/default/ebusd if necessary"
echo " (especially if your device is not /dev/ttyUSB0)" echo " (especially if your device is not /dev/ttyUSB0)"
echo "2. Place CSV configuration files in /etc/ebusd/" echo "2. Start the daemon with 'systemctl start ebusd'"
echo " (see https://github.com/john30/ebusd-configuration)" echo "3. Check the log file /var/log/ebusd.log"
echo "3. Start the daemon with 'systemctl start ebusd'" echo "4. Make the daemon autostart with 'systemctl enable ebusd'"
echo "4. Check the log file /var/log/ebusd.log"
echo "5. Make the daemon autostart with 'systemctl enable ebusd'"
EOF EOF
else else
echo /etc/init.d >> $RELEASE/DEBIAN/dirs echo /etc/init.d >> $RELEASE/DEBIAN/dirs
@@ -136,11 +133,9 @@ else
echo "Instructions:" echo "Instructions:"
echo "1. Edit /etc/default/ebusd if necessary" echo "1. Edit /etc/default/ebusd if necessary"
echo " (especially if your device is not /dev/ttyUSB0)" echo " (especially if your device is not /dev/ttyUSB0)"
echo "2. Place CSV configuration files in /etc/ebusd/" echo "2. Start the daemon with 'service ebusd start'"
echo " (see https://github.com/john30/ebusd-configuration)" echo "3. Check the log file /var/log/ebusd.log"
echo "3. Start the daemon with 'service ebusd start'" echo "4. Make the daemon autostart with 'update-rc.d ebusd enable'"
echo "4. Check the log file /var/log/ebusd.log"
echo "5. Make the daemon autostart with 'update-rc.d ebusd enable'"
EOF EOF
fi fi
chmod 755 $RELEASE/DEBIAN/postinst chmod 755 $RELEASE/DEBIAN/postinst