Commit f98e1b2d authored by sxc's avatar sxc
Browse files

Merge branch 'master' of git.chocolatnoir.net:ccnn/propellor

parents 932d36aa 60e7ecfc
Pipeline #3 failed with stages
......@@ -168,6 +168,7 @@ main3 = host "main3.chocolatnoir.net" $ props
--
-- ---------------------------------------------------------
-- -- main server in the cloud as said
<<<<<<< HEAD
d3 :: Host
d3 = host "d3.chocolatnoir.net" $ props
-- & osDebian (Stable "stretch") X86_64
......@@ -228,6 +229,25 @@ d4 = host "d4.chocolatnoir.net" $ props
-- (these should be migrated in the installation of gitlab).
-- & Apt.installed ["gpg", "curl", "debian-archive-keyring"]
=======
-- d3 :: Host
-- d3 = host "d3.chocolatnoir.net" $ props
-- & osDebian (Stable "stretch") X86_64
-- & ccnn
-- & User.accountFor (User "tunnel-guest")
-- & User.shellSetTo (User "tunnel-guest") "/bin/false"
-- & Ssh.authorizedKey (User "tunnel-guest") sshKeyPubTunnel1
-- & Ssh.authorizedKey (User "tunnel-guest") sshKeyPubTunnel2
-- & Apt.installed ["pwgen", "debconf", "debconf-utils", "haveged", "debconf-doc", "debian-policy"]
-- & Apt.installed ["locate"]
-- & Apt.installed ["gitlab", "gitlab-shell"]
-- & Apt.installed ["iceweasel"]
-- & Cron.runPropellor (Cron.Times "30 * * * *")
-- & osDebian Unstable X86_64
-- & User.hasSomePassword (User "root")
-- & File.dirExists "/var/www"
>>>>>>> 60e7ecfc3a89359908db923e9abc559ca22ebd4a
-- ----------------------------------------------------------------------
......@@ -390,7 +410,11 @@ setting_emacs_proxy u@(User username) = proxy <!> no_proxy
-- ----------------------------------------------------------------------
-- Installing and configuring a simple http server using apache
<<<<<<< HEAD
http_host :: Property Debian
=======
http_host :: Property DebianLike
>>>>>>> 60e7ecfc3a89359908db923e9abc559ca22ebd4a
http_host = propertyList "Setting up an apache http server" $ props
-- Insuring Apache is running :
& Apache.installed
......@@ -756,7 +780,11 @@ z40_content =
-- Trying to set a DLNA server using rygel
-- --------------------------------------------------------------
<<<<<<< HEAD
setting_minidlna :: Property Debian
=======
setting_minidlna :: Property DebianLike
>>>>>>> 60e7ecfc3a89359908db923e9abc559ca22ebd4a
setting_minidlna = "Installing and setting up minidlna as DLNA server" ==>
( AptAddition.installedNotOrBPO BPOOrNot
[ "minidlna"
......@@ -779,7 +807,11 @@ setting_minidlna = "Installing and setting up minidlna as DLNA server" ==>
)
<<<<<<< HEAD
setting_dlna :: Property Debian
=======
setting_dlna :: Property DebianLike
>>>>>>> 60e7ecfc3a89359908db923e9abc559ca22ebd4a
setting_dlna = propertyList "Setting a RYGEL DLNA server" $ props
& AptAddition.installedNotOrBPO BPOOrNot
[ "rygel"
......@@ -836,7 +868,11 @@ setting_dlna = propertyList "Setting a RYGEL DLNA server" $ props
-- `onChange` Apt.reConfigure [
-- ]
<<<<<<< HEAD
setting_mail_server :: NotOrBPO -> Property Debian
=======
setting_mail_server :: NotOrBPO -> Property DebianLike
>>>>>>> 60e7ecfc3a89359908db923e9abc559ca22ebd4a
setting_mail_server bpo =
AptAddition.installedNotOrBPO bpo
[ "apache2"
......@@ -1135,7 +1171,11 @@ setting_mail_server bpo =
-- After which we have to ensure proper configuration of the roundcube interface :
--
<<<<<<< HEAD
setting_LDAP_server :: NotOrBPO -> Property Debian
=======
setting_LDAP_server :: NotOrBPO -> Property DebianLike
>>>>>>> 60e7ecfc3a89359908db923e9abc559ca22ebd4a
setting_LDAP_server bpo = propertyList "Setting a LDAP server" $ props
& AptAddition.installedNotOrBPO bpo
[ "pwgen"
......
......@@ -256,25 +256,17 @@ cd ${curdir}
title "Installation de FusionDirectory"
<<<<<<< HEAD
<<<<<<< HEAD
apt-get -y install fusiondirectory fusiondirectory-schema php-mdb2 php-mbstring libapache2-mpm-itk
fusiondirectory-insert-schema /etc/ldap/schema/fusiondirectory/
adduser --system fusiondirectory
## Forcing the correct taking into account of the modified/completed schema (restart mandatory ?)
systemctl restart slapd.service
=======
apt-get -y install fusiondirectory fusiondirectory-schema php-mdb2 apache2-mpm-itk
fusiondirectory-insert-schema /etc/ldap/schema/fusiondirectory/
adduser --system fusiondirectory
>>>>>>> Preparing the material to get fusing directory to run on dedi.chocolatnoir.net, though not installing it through Propellor.
=======
apt-get -y install fusiondirectory fusiondirectory-schema php-mdb2 php-mbstring libapache2-mpm-itk
fusiondirectory-insert-schema /etc/ldap/schema/fusiondirectory/
adduser --system fusiondirectory
## Forcing the correct taking into account of the modified/completed schema (restart mandatory ?)
systemctl restart slapd.service
>>>>>>> propellor spin
sed -i -e "/engine/i\ \ \ \ AssignUserID fusiondirectory nogroup" /etc/fusiondirectory/fusiondirectory-apache.conf
chown -R fusiondirectory /var/cache/fusiondirectory/ /var/spool/fusiondirectory/
......
-----BEGIN PGP MESSAGE-----
Comment: GPGTools - http://gpgtools.org
hQIMA6HCHl+NeoJFARAAmEZqlAr+9/833OEsZWx5c8NfHKvDnUhep3uUn2MGCQJS
xY5TnmvDiv1XhGelxmEeAlAn84piCJuMf+Cvr0072JvAPwamTWHWwcFJNubqE3eH
IWWSEdmPSPY48mKFKD3GczJZ8YRyMgv3pFkvYcmIXZs6H6pKTd8/jBV/J3QqqXoc
HBYiK+8quJfK4qRjlTpFODc94WtOgMtUJq9qaz1rHxrfiujJe8PNvd3QRIODqADh
nTnOlPbcu6s92PGIeZcqMfQHxtF3xE/MxZ/ZdDEpYHYVbLBXFi8vuXMnoNYiZFiN
Tp9a8XY9ajer82sxBUgSLey2ZRI9jr/qrEsP9LaMHkmisPXekNmXOO6I/7ghXSL4
BSW1pxsTA26Tg9Tf6AGIr2BVdiuYYOzlFhjClwwR2uB7nbWWsSGQGMYXY0zDQnfR
vQo4zfY1gOrwqTD+Lz+0rfwvYy3cENFJdxQE81HT5vLOqOz3rdfLpT2VbJhOwcsP
oAuBXRGJMLXIMutyQO7rAL1jlOCP1MRQgRq7+mbmkWSg0hDeItH1GY2ZBhhAXGOc
af7UkFDPoo1saqdZiFgFSKROmmGeF4kKo7XQM8xYr8h+1KcW8GKhqFin1ANRK8HJ
tEqLm8nRDREmkYexcyNMOOZQ29My8u7cWZvMQhDQhYH+0KGLSFb2XlDaBTakd/PS
jwF8YhBlwsoYDHtoiwTJb/gKYVci49SkdWoHFzeOWPfYIu/oXBAhG1lZU8CNM6Jl
wowu47xKRq9eAp0cRBQLc5LzxpIfX8j7ypb4CpWtmCHnV+n79XgmR90LGgDHQmdy
dOhk7/q6rlzgd/hJ7vgmxXo4pSE73WVBJ2b4Mx7tODxDXUK8hy+qZAQoikYUL6fM
=YFjK
-----END PGP MESSAGE-----
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment