From 7431e85bb41e86a550420ff2a9e4726f6cca835c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Wed, 7 Nov 2018 16:33:13 +0100 Subject: [PATCH] Added ws.pm.f29. --- sources/ws.pm.f29/config | 23 ++++ sources/ws.pm.f29/envvars | 4 + .../ws.pm.f29/firstboot/01_setupnetworking.sh | 55 ++++++++ sources/ws.pm.f29/firstboot/02_settimezone.sh | 21 ++++ sources/ws.pm.f29/firstboot/03_setupldap.sh | 10 ++ sources/ws.pm.f29/firstboot/10_certbot.sh | 40 ++++++ sources/ws.pm.f29/firstboot/99_cleanup.sh | 6 + .../ws.pm.f29/postinstall/01_setownership.sh | 7 ++ .../postinstall/02_setpermissions.sh | 5 + .../ws.pm.f29/postinstall/03_installfiles.sh | 15 +++ .../ws.pm.f29/postinstall/10_setupservices.sh | 7 ++ sources/ws.pm.f29/postinstall/99_cleanup.sh | 6 + .../ws.pm.f29/postinstall/install/etc/hosts | 4 + .../etc/httpd/conf.d/useribm.hu.443.conf.le | 119 ++++++++++++++++++ .../etc/httpd/conf.d/useribm.hu.80.conf | 56 +++++++++ .../conf.d/userrendszerhaz.hu.443.conf.le | 119 ++++++++++++++++++ .../httpd/conf.d/userrendszerhaz.hu.80.conf | 56 +++++++++ 17 files changed, 553 insertions(+) create mode 100644 sources/ws.pm.f29/config create mode 100644 sources/ws.pm.f29/envvars create mode 100755 sources/ws.pm.f29/firstboot/01_setupnetworking.sh create mode 100755 sources/ws.pm.f29/firstboot/02_settimezone.sh create mode 100755 sources/ws.pm.f29/firstboot/03_setupldap.sh create mode 100755 sources/ws.pm.f29/firstboot/10_certbot.sh create mode 100755 sources/ws.pm.f29/firstboot/99_cleanup.sh create mode 100755 sources/ws.pm.f29/postinstall/01_setownership.sh create mode 100755 sources/ws.pm.f29/postinstall/02_setpermissions.sh create mode 100755 sources/ws.pm.f29/postinstall/03_installfiles.sh create mode 100755 sources/ws.pm.f29/postinstall/10_setupservices.sh create mode 100755 sources/ws.pm.f29/postinstall/99_cleanup.sh create mode 100644 sources/ws.pm.f29/postinstall/install/etc/hosts create mode 100644 sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/useribm.hu.443.conf.le create mode 100644 sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf create mode 100644 sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le create mode 100644 sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.80.conf diff --git a/sources/ws.pm.f29/config b/sources/ws.pm.f29/config new file mode 100644 index 0000000..d7c15c0 --- /dev/null +++ b/sources/ws.pm.f29/config @@ -0,0 +1,23 @@ +lxc.include = /usr/share/lxc/config/common.conf + +lxc.arch = x86_64 +lxc.uts.name = ws.pm.user.hu +lxc.rootfs.path = __CONTAINER_PATH__/rootfs +lxc.mount.auto = proc:rw sys:ro +lxc.mount.entry = __CONTAINER_FILESYSTEMS_PATH__/htdocs.useribm.hu.443 var/www/htdocs.useribm.hu.443 none bind,create=dir 0 0 +lxc.mount.entry = __CONTAINER_FILESYSTEMS_PATH__/htdocs.useribm.hu.80 var/www/htdocs.useribm.hu.80 none bind,create=dir 0 0 +lxc.mount.entry = __CONTAINER_FILESYSTEMS_PATH__/htdocs.userrendszerhaz.hu.443 var/www/htdocs.userrendszerhaz.hu.443 none bind,create=dir 0 0 +lxc.mount.entry = __CONTAINER_FILESYSTEMS_PATH__/htdocs.userrendszerhaz.hu.80 var/www/htdocs.userrendszerhaz.hu.80 none bind,create=dir 0 0 + +lxc.net.0.type = veth +lxc.net.0.flags = up +lxc.net.0.link = brh +lxc.net.0.hwaddr = 02:0c:18:03:ad:f9 + +lxc.autodev = 1 + +lxc.signal.halt = SIGRTMIN+4 + +lxc.start.auto = 1 +lxc.start.order = 20 +lxc.start.delay = 10 diff --git a/sources/ws.pm.f29/envvars b/sources/ws.pm.f29/envvars new file mode 100644 index 0000000..91bef48 --- /dev/null +++ b/sources/ws.pm.f29/envvars @@ -0,0 +1,4 @@ +#BASE_PACKAGES="NetworkManager initscripts openssh-server openssh-clients openssh-ldap rootfiles rsyslog sudo tar vim-minimal" +#SPEC_PACKAGES="authselect httpd mod_ssl openldap-clients nss-pam-ldapd pam_ssh passwd python2-certbot-apache python3-certbot-apache" +BASE_PACKAGES="NetworkManager initscripts rootfiles rsyslog tar" +SPEC_PACKAGES="httpd mod_ssl python3-certbot-apache" diff --git a/sources/ws.pm.f29/firstboot/01_setupnetworking.sh b/sources/ws.pm.f29/firstboot/01_setupnetworking.sh new file mode 100755 index 0000000..adb88f5 --- /dev/null +++ b/sources/ws.pm.f29/firstboot/01_setupnetworking.sh @@ -0,0 +1,55 @@ +#!/bin/sh + + +sleep 1 +systemctl --quiet is-active NetworkManager.service +NM_RC=$? +WAITED=0 +while [ $NM_RC -ne 0 ] +do + echo -n . + sleep 1 + WAITED=1 + systemctl --quiet is-active NetworkManager.service + NM_RC=$? +done +[ $WAITED -ne 0 ] && echo + +CONNECTIONS=$(nmcli connection show | grep -v '^NAME' | wc -l) +if [ $CONNECTIONS -ne 1 ] +then + echo "Number of connections: $CONNECTIONS" >&2 + exit 1 +fi + +CONNECTION_LINE=$(nmcli connection show | grep -v '^NAME') +CONNECTION_TOKENS=$(echo $CONNECTION_LINE | wc -w) +#CONNECTION_NAME_POS=$(( $CONNECTION_TOKENS - 3 )) +CONNECTION_UUID_POS=$(( $CONNECTION_TOKENS - 2 )) +#CONNECTION_TYPE_POS=$(( $CONNECTION_TOKENS - 1 )) +CONNECTION_DEVICE_POS=$CONNECTION_TOKENS +#CONNECTION_NAME=$(echo $CONNECTION_LINE \ +# | cut -f -$CONNECTION_NAME_POS -d ' ') +CONNECTION_UUID=$(echo $CONNECTION_LINE \ + | cut -f $CONNECTION_UUID_POS -d ' ') +#CONNECTION_TYPE=$(echo $CONNECTION_LINE \ +# | cut -f $CONNECTION_TYPE_POS -d ' ') +CONNECTION_DEVICE=$(echo $CONNECTION_LINE \ + | cut -f $CONNECTION_DEVICE_POS -d ' ') + +nmcli connection delete uuid "$CONNECTION_UUID" + +nmcli connection add \ + type 802-3-ethernet \ + ifname $CONNECTION_DEVICE \ + con-name perimeter \ + autoconnect yes \ + save yes \ + ipv4.addresses "192.168.173.249/24" \ + ipv4.dns "192.168.173.174" \ + ipv4.dns-search "pm.user.hu" \ + ipv4.gateway "192.168.173.254" \ + ipv4.method "manual" \ + ipv4.routes "10.228.0.0/16 192.168.173.1, 192.168.42.0/24 192.168.173.1" \ + ipv6.method "ignore" +nmcli connection show diff --git a/sources/ws.pm.f29/firstboot/02_settimezone.sh b/sources/ws.pm.f29/firstboot/02_settimezone.sh new file mode 100755 index 0000000..20b2a71 --- /dev/null +++ b/sources/ws.pm.f29/firstboot/02_settimezone.sh @@ -0,0 +1,21 @@ +#!/bin/sh + + +sleep 1 +systemctl --quiet is-active dbus.service +DBUS_RC=$? +WAITED=0 +while [ $DBUS_RC -ne 0 ] +do + if [ $WAITED -eq 0 ] + then + echo -n "Waiting for dbus.service" + fi + echo -n . + sleep 1 + WAITED=1 + systemctl --quiet is-active dbus.service + DBUS_RC=$? +done +[ $WAITED -ne 0 ] && echo +timedatectl set-timezone Europe/Budapest diff --git a/sources/ws.pm.f29/firstboot/03_setupldap.sh b/sources/ws.pm.f29/firstboot/03_setupldap.sh new file mode 100755 index 0000000..4b58626 --- /dev/null +++ b/sources/ws.pm.f29/firstboot/03_setupldap.sh @@ -0,0 +1,10 @@ +#!/bin/sh + + +exit 0 +authselect select sssd with-mkhomedir --force + +cat >>/etc/openldap/ldap.conf < + ServerName www.useribm.hu + ServerAlias useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPreserveHost On + ProxyPass /ugyvitel http://192.168.42.248:8079/ugyvitel keepalive=On connectiontimeout=600 + ProxyPassReverse /ugyvitel http://192.168.42.248:8079/ugyvitel + + # avon file transfer -> shs.pm.user.hu:80 + ProxyPass /avonxfr http://192.168.173.251/avonxfr + ProxyPassReverse /avonxfr http://192.168.173.251/avonxfr + + # erste file transfer -> shs.pm.user.hu:80 + ProxyPass /erstexfr http://192.168.173.251/erstexfr + ProxyPassReverse /erstexfr http://192.168.173.251/erstexfr + + # onyf file transfer -> shs.pm.user.hu:80 + ProxyPass /onyfxfr http://192.168.173.251/onyfxfr + ProxyPassReverse /onyfxfr http://192.168.173.251/onyfxfr + + # ubis file transfer -> shs.pm.user.hu:80 + ProxyPass /ubisxfr http://192.168.173.251/ubisxfr + ProxyPassReverse /ubisxfr http://192.168.173.251/ubisxfr + + # dvasary's redmine -> dvredmine.usr.user.hu:80 + ProxyPass /redmine http://10.228.62.193/ + ProxyPassReverse /redmine http://10.228.62.193/ + + # webdav store -> store.usr.user.hu:80 + #ProxyPass /store http://store.usr.user.hu/ + #ProxyPassReverse /store http://store.usr.user.hu/ + + + + ServerName hg.useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPass "/" "http://hg.pm.user.hu/jtrac" + + + + ServerName jtrac.useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPass /jtrac http://192.168.43.210/jtrac + ProxyPassReverse /jtrac http://192.168.43.210/jtrac + + + + ServerName minicrm.useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPass /minicrm http://minicrm.usr.user.hu:8080/minicrm + ProxyPassReverse /minicrm http://minicrm.usr.user.hu:8080/minicrm + + + + ServerName redmine.useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPass / http://10.228.62.193/ + ProxyPassReverse / http://10.228.62.193/ + diff --git a/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf b/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf new file mode 100644 index 0000000..cc36dcd --- /dev/null +++ b/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/useribm.hu.80.conf @@ -0,0 +1,56 @@ + + ServerName www.useribm.hu + ServerAlias useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.80" + + + + Require all granted + + + + Redirect permanent / https://www.useribm.hu/ + + + + ServerName jtrac.useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.80" + + + + Require all granted + + + + Redirect permanent / https://jtrac.useribm.hu/ + + + + ServerName minicrm.useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.80" + + + + Require all granted + + + + Redirect permanent / https://minicrm.useribm.hu/ + + + + ServerName redmine.useribm.hu + ServerAdmin webadmin@useribm.hu + DocumentRoot "/var/www/htdocs.useribm.hu.80" + + + + Require all granted + + + + Redirect permanent / https://redmine.useribm.hu/ + diff --git a/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le b/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le new file mode 100644 index 0000000..54247c7 --- /dev/null +++ b/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.443.conf.le @@ -0,0 +1,119 @@ + + ServerName www.userrendszerhaz.hu + ServerAlias userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPreserveHost On + ProxyPass /ugyvitel http://192.168.42.248:8079/ugyvitel keepalive=On connectiontimeout=600 + ProxyPassReverse /ugyvitel http://192.168.42.248:8079/ugyvitel + + # avon file transfer -> shs.pm.user.hu:80 + ProxyPass /avonxfr http://192.168.173.251/avonxfr + ProxyPassReverse /avonxfr http://192.168.173.251/avonxfr + + # erste file transfer -> shs.pm.user.hu:80 + ProxyPass /erstexfr http://192.168.173.251/erstexfr + ProxyPassReverse /erstexfr http://192.168.173.251/erstexfr + + # onyf file transfer -> shs.pm.user.hu:80 + ProxyPass /onyfxfr http://192.168.173.251/onyfxfr + ProxyPassReverse /onyfxfr http://192.168.173.251/onyfxfr + + # ubis file transfer -> shs.pm.user.hu:80 + ProxyPass /ubisxfr http://192.168.173.251/ubisxfr + ProxyPassReverse /ubisxfr http://192.168.173.251/ubisxfr + + # dvasary's redmine -> dvredmine.usr.user.hu:80 + ProxyPass /redmine http://10.228.62.193/ + ProxyPassReverse /redmine http://10.228.62.193/ + + # webdav store -> store.usr.user.hu:80 + #ProxyPass /store http://store.usr.user.hu/ + #ProxyPassReverse /store http://store.usr.user.hu/ + + + + ServerName hg.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPass "/" "http://hg.pm.user.hu/jtrac" + + + + ServerName jtrac.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPass /jtrac http://192.168.43.210/jtrac + ProxyPassReverse /jtrac http://192.168.43.210/jtrac + + + + ServerName minicrm.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPass /minicrm http://minicrm.usr.user.hu:8080/minicrm + ProxyPassReverse /minicrm http://minicrm.usr.user.hu:8080/minicrm + + + + ServerName redmine.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.443" + + SSLCertificateFile /etc/letsencrypt/live/user/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/user/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + + + Require all granted + + + + ProxyPass / http://10.228.62.193/ + ProxyPassReverse / http://10.228.62.193/ + diff --git a/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.80.conf b/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.80.conf new file mode 100644 index 0000000..e837293 --- /dev/null +++ b/sources/ws.pm.f29/postinstall/install/etc/httpd/conf.d/userrendszerhaz.hu.80.conf @@ -0,0 +1,56 @@ + + ServerName www.userrendszerhaz.hu + ServerAlias userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.80" + + + + Require all granted + + + + Redirect permanent / https://www.userrendszerhaz.hu/ + + + + ServerName jtrac.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.80" + + + + Require all granted + + + + Redirect permanent / https://jtrac.userrendszerhaz.hu/ + + + + ServerName minicrm.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.80" + + + + Require all granted + + + + Redirect permanent / https://minicrm.userrendszerhaz.hu/ + + + + ServerName redmine.userrendszerhaz.hu + ServerAdmin webadmin@userrendszerhaz.hu + DocumentRoot "/var/www/htdocs.userrendszerhaz.hu.80" + + + + Require all granted + + + + Redirect permanent / https://redmine.userrendszerhaz.hu/ + -- 2.54.0