{"action":"created","comment":{"url":"https://api.github.com/repos/Normation/rudder-packages/pulls/comments/33033586","id":33033586,"diff_hunk":"@@ -1,52 +1,26 @@\n-#========================================================\n-# Configuration of Rudder's OpenLDAP instance\n-#========================================================\n-\n-# IP and port to listen\n-IP=\"127.0.0.1\"\n-SSLIP=\"*\"\n-PORT=\"389\"\n-SSLPORT=\"636\"\n-\n-# OpenLDAP directory and files\n-SLAPD_PATH=\"/opt/rudder\"\n-SLAPD_PID_FILE=\"/var/rudder/run/slapd.pid\"\n-SLAPD_CONF=\"$SLAPD_PATH/etc/openldap/slapd.conf\"\n-SLAPD_CONF_DIR=\"\"\n-SLAPD_SERVICES=\"ldap://$IP:$PORT\"\n-SLAPD_PARAMS=\"-n rudder-slapd\"\n-SLAPD_BIN=\"$SLAPD_PATH/libexec/slapd\"\n-SLAPD_USER=\"\"\n-SLAPD_GROUP=\"\"\n-\n-DATA_PATH=\"auto\"\n-\n-SLAPCAT_BIN=\"$SLAPD_PATH/sbin/slapcat\"\n-SLAPINDEX_BIN=\"$SLAPD_PATH/sbin/slapindex\"\n-SLAPTEST_BIN=\"$SLAPD_PATH/sbin/slaptest\"\n-\n-SLURPD_PID_FILE=\"$SLAPD_PATH/var/run/slurpd.pid\"\n-SLURPD_PARAMS=\"\"\n-SLURPD_BIN=\"$SLAPD_PATH/libexec/slurpd\"\n-\n-# BerkeleyDB directory and files\n-BDB_PATH=\"/usr\"\n-DB_ARCHIVE_BIN=\"$BDB_PATH/bin/db4.6_archive\"\n-DB_RECOVER_BIN=\"$BDB_PATH/bin/db4.6_recover\"\n-RECOVER_AT_STARTUP=\"0\"\n-\n-# Backup\n-BACKUP_AT_SHUTDOWN=\"1\"\n-BACKUP_PATH=\"/var/rudder/ldap/backup\"\n-BACKUP_FILE=\"$BACKUP_PATH/data_`date +%Y%m%d%H%M%S`.ldif\"\n-BACKUP_SUFFIX=\"`date +%Y%m%d%H%M%S`.ldif\"\n-\n-# Other\n-TIMEOUT=\"30\" # Max time to stop process\n-FD_LIMIT=\"1024\" # Max file descriptor\n-\n-# Specify cachesize to set on the Rudder database for OpenLDAP\n-# \"auto\" means choose the best value depending on number of entries and total machine RAM\n-# \"noauto\" means don't touch it\n-# a number means use this value\n-RUDDER_CACHESIZE=\"auto\" \n+#\n+# OpenLDAP server configuration\n+#\n+\n+# Source variables from /opt/rudder/etc/rudder-slapd.conf\n+# Warning: removing this is likely to prevent OpenLDAP from\n+# starting correctly\n+[ -f /opt/rudder/etc/rudder-slapd.conf ] && . /opt/rudder/etc/rudder-slapd.conf","path":"rudder-inventory-ldap/SOURCES/rudder-inventory-ldap.default","position":60,"original_position":60,"commit_id":"5dca5fa3ad06cf2dd85dc8faada8d35a0da48fcc","original_commit_id":"5dca5fa3ad06cf2dd85dc8faada8d35a0da48fcc","user":{"login":"peckpeck","id":7976666,"avatar_url":"https://avatars.githubusercontent.com/u/7976666?v=3","gravatar_id":"","url":"https://api.github.com/users/peckpeck","html_url":"https://github.com/peckpeck","followers_url":"https://api.github.com/users/peckpeck/followers","following_url":"https://api.github.com/users/peckpeck/following{/other_user}","gists_url":"https://api.github.com/users/peckpeck/gists{/gist_id}","starred_url":"https://api.github.com/users/peckpeck/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/peckpeck/subscriptions","organizations_url":"https://api.github.com/users/peckpeck/orgs","repos_url":"https://api.github.com/users/peckpeck/repos","events_url":"https://api.github.com/users/peckpeck/events{/privacy}","received_events_url":"https://api.github.com/users/peckpeck/received_events","type":"User","site_admin":false},"body":"isn't this redundant with the one in rudder-inventory-ldap.init ?\r\n","created_at":"2015-06-23T12:04:23Z","updated_at":"2015-06-23T12:04:23Z","html_url":"https://github.com/Normation/rudder-packages/pull/690#discussion_r33033586","pull_request_url":"https://api.github.com/repos/Normation/rudder-packages/pulls/690","_links":{"self":{"href":"https://api.github.com/repos/Normation/rudder-packages/pulls/comments/33033586"},"html":{"href":"https://github.com/Normation/rudder-packages/pull/690#discussion_r33033586"},"pull_request":{"href":"https://api.github.com/repos/Normation/rudder-packages/pulls/690"}}},"pull_request":{"url":"https://api.github.com/repos/Normation/rudder-packages/pulls/690","id":38121665,"html_url":"https://github.com/Normation/rudder-packages/pull/690","diff_url":"https://github.com/Normation/rudder-packages/pull/690.diff","patch_url":"https://github.com/Normation/rudder-packages/pull/690.patch","issue_url":"https://api.github.com/repos/Normation/rudder-packages/issues/690","number":690,"state":"open","locked":false,"title":"Fixes #6773: rudder-ldap and rudder-jetty settings should be user configurable in /etc/default","user":{"login":"Kegeruneku","id":917886,"avatar_url":"https://avatars.githubusercontent.com/u/917886?v=3","gravatar_id":"","url":"https://api.github.com/users/Kegeruneku","html_url":"https://github.com/Kegeruneku","followers_url":"https://api.github.com/users/Kegeruneku/followers","following_url":"https://api.github.com/users/Kegeruneku/following{/other_user}","gists_url":"https://api.github.com/users/Kegeruneku/gists{/gist_id}","starred_url":"https://api.github.com/users/Kegeruneku/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Kegeruneku/subscriptions","organizations_url":"https://api.github.com/users/Kegeruneku/orgs","repos_url":"https://api.github.com/users/Kegeruneku/repos","events_url":"https://api.github.com/users/Kegeruneku/events{/privacy}","received_events_url":"https://api.github.com/users/Kegeruneku/received_events","type":"User","site_admin":false},"body":"https://www.rudder-project.org/redmine/issues/6773","created_at":"2015-06-19T15:56:17Z","updated_at":"2015-06-23T12:04:23Z","closed_at":null,"merged_at":null,"merge_commit_sha":"23c5123044630780167d746a4be2626e42c2bef3","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Normation/rudder-packages/pulls/690/commits","review_comments_url":"https://api.github.com/repos/Normation/rudder-packages/pulls/690/comments","review_comment_url":"https://api.github.com/repos/Normation/rudder-packages/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Normation/rudder-packages/issues/690/comments","statuses_url":"https://api.github.com/repos/Normation/rudder-packages/statuses/5dca5fa3ad06cf2dd85dc8faada8d35a0da48fcc","head":{"label":"Kegeruneku:bug_6773/rudder_ldap_and_rudder_jetty_settings_should_be_user_configurable_in_etc_default","ref":"bug_6773/rudder_ldap_and_rudder_jetty_settings_should_be_user_configurable_in_etc_default","sha":"5dca5fa3ad06cf2dd85dc8faada8d35a0da48fcc","user":{"login":"Kegeruneku","id":917886,"avatar_url":"https://avatars.githubusercontent.com/u/917886?v=3","gravatar_id":"","url":"https://api.github.com/users/Kegeruneku","html_url":"https://github.com/Kegeruneku","followers_url":"https://api.github.com/users/Kegeruneku/followers","following_url":"https://api.github.com/users/Kegeruneku/following{/other_user}","gists_url":"https://api.github.com/users/Kegeruneku/gists{/gist_id}","starred_url":"https://api.github.com/users/Kegeruneku/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Kegeruneku/subscriptions","organizations_url":"https://api.github.com/users/Kegeruneku/orgs","repos_url":"https://api.github.com/users/Kegeruneku/repos","events_url":"https://api.github.com/users/Kegeruneku/events{/privacy}","received_events_url":"https://api.github.com/users/Kegeruneku/received_events","type":"User","site_admin":false},"repo":{"id":30084163,"name":"rudder-packages","full_name":"Kegeruneku/rudder-packages","owner":{"login":"Kegeruneku","id":917886,"avatar_url":"https://avatars.githubusercontent.com/u/917886?v=3","gravatar_id":"","url":"https://api.github.com/users/Kegeruneku","html_url":"https://github.com/Kegeruneku","followers_url":"https://api.github.com/users/Kegeruneku/followers","following_url":"https://api.github.com/users/Kegeruneku/following{/other_user}","gists_url":"https://api.github.com/users/Kegeruneku/gists{/gist_id}","starred_url":"https://api.github.com/users/Kegeruneku/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Kegeruneku/subscriptions","organizations_url":"https://api.github.com/users/Kegeruneku/orgs","repos_url":"https://api.github.com/users/Kegeruneku/repos","events_url":"https://api.github.com/users/Kegeruneku/events{/privacy}","received_events_url":"https://api.github.com/users/Kegeruneku/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Kegeruneku/rudder-packages","description":"","fork":true,"url":"https://api.github.com/repos/Kegeruneku/rudder-packages","forks_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/forks","keys_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/teams","hooks_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/hooks","issue_events_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/issues/events{/number}","events_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/events","assignees_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/assignees{/user}","branches_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/branches{/branch}","tags_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/tags","blobs_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/git/refs{/sha}","trees_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/statuses/{sha}","languages_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/languages","stargazers_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/stargazers","contributors_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/contributors","subscribers_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/subscribers","subscription_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/subscription","commits_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/commits{/sha}","git_commits_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/git/commits{/sha}","comments_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/comments{/number}","issue_comment_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/issues/comments{/number}","contents_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/contents/{+path}","compare_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/merges","archive_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/downloads","issues_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/issues{/number}","pulls_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/pulls{/number}","milestones_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/milestones{/number}","notifications_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/labels{/name}","releases_url":"https://api.github.com/repos/Kegeruneku/rudder-packages/releases{/id}","created_at":"2015-01-30T18:00:15Z","updated_at":"2015-04-27T09:48:03Z","pushed_at":"2015-06-23T08:54:27Z","git_url":"git://github.com/Kegeruneku/rudder-packages.git","ssh_url":"git@github.com:Kegeruneku/rudder-packages.git","clone_url":"https://github.com/Kegeruneku/rudder-packages.git","svn_url":"https://github.com/Kegeruneku/rudder-packages","homepage":"http://www.rudder-project.org/","size":5013,"stargazers_count":0,"watchers_count":0,"language":"Shell","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"Normation:branches/rudder/3.1","ref":"branches/rudder/3.1","sha":"9bab341c2197998e82ee6930849934af0587b41a","user":{"login":"Normation","id":695105,"avatar_url":"https://avatars.githubusercontent.com/u/695105?v=3","gravatar_id":"","url":"https://api.github.com/users/Normation","html_url":"https://github.com/Normation","followers_url":"https://api.github.com/users/Normation/followers","following_url":"https://api.github.com/users/Normation/following{/other_user}","gists_url":"https://api.github.com/users/Normation/gists{/gist_id}","starred_url":"https://api.github.com/users/Normation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Normation/subscriptions","organizations_url":"https://api.github.com/users/Normation/orgs","repos_url":"https://api.github.com/users/Normation/repos","events_url":"https://api.github.com/users/Normation/events{/privacy}","received_events_url":"https://api.github.com/users/Normation/received_events","type":"Organization","site_admin":false},"repo":{"id":2528278,"name":"rudder-packages","full_name":"Normation/rudder-packages","owner":{"login":"Normation","id":695105,"avatar_url":"https://avatars.githubusercontent.com/u/695105?v=3","gravatar_id":"","url":"https://api.github.com/users/Normation","html_url":"https://github.com/Normation","followers_url":"https://api.github.com/users/Normation/followers","following_url":"https://api.github.com/users/Normation/following{/other_user}","gists_url":"https://api.github.com/users/Normation/gists{/gist_id}","starred_url":"https://api.github.com/users/Normation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Normation/subscriptions","organizations_url":"https://api.github.com/users/Normation/orgs","repos_url":"https://api.github.com/users/Normation/repos","events_url":"https://api.github.com/users/Normation/events{/privacy}","received_events_url":"https://api.github.com/users/Normation/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Normation/rudder-packages","description":"","fork":false,"url":"https://api.github.com/repos/Normation/rudder-packages","forks_url":"https://api.github.com/repos/Normation/rudder-packages/forks","keys_url":"https://api.github.com/repos/Normation/rudder-packages/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Normation/rudder-packages/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Normation/rudder-packages/teams","hooks_url":"https://api.github.com/repos/Normation/rudder-packages/hooks","issue_events_url":"https://api.github.com/repos/Normation/rudder-packages/issues/events{/number}","events_url":"https://api.github.com/repos/Normation/rudder-packages/events","assignees_url":"https://api.github.com/repos/Normation/rudder-packages/assignees{/user}","branches_url":"https://api.github.com/repos/Normation/rudder-packages/branches{/branch}","tags_url":"https://api.github.com/repos/Normation/rudder-packages/tags","blobs_url":"https://api.github.com/repos/Normation/rudder-packages/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Normation/rudder-packages/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Normation/rudder-packages/git/refs{/sha}","trees_url":"https://api.github.com/repos/Normation/rudder-packages/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Normation/rudder-packages/statuses/{sha}","languages_url":"https://api.github.com/repos/Normation/rudder-packages/languages","stargazers_url":"https://api.github.com/repos/Normation/rudder-packages/stargazers","contributors_url":"https://api.github.com/repos/Normation/rudder-packages/contributors","subscribers_url":"https://api.github.com/repos/Normation/rudder-packages/subscribers","subscription_url":"https://api.github.com/repos/Normation/rudder-packages/subscription","commits_url":"https://api.github.com/repos/Normation/rudder-packages/commits{/sha}","git_commits_url":"https://api.github.com/repos/Normation/rudder-packages/git/commits{/sha}","comments_url":"https://api.github.com/repos/Normation/rudder-packages/comments{/number}","issue_comment_url":"https://api.github.com/repos/Normation/rudder-packages/issues/comments{/number}","contents_url":"https://api.github.com/repos/Normation/rudder-packages/contents/{+path}","compare_url":"https://api.github.com/repos/Normation/rudder-packages/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Normation/rudder-packages/merges","archive_url":"https://api.github.com/repos/Normation/rudder-packages/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Normation/rudder-packages/downloads","issues_url":"https://api.github.com/repos/Normation/rudder-packages/issues{/number}","pulls_url":"https://api.github.com/repos/Normation/rudder-packages/pulls{/number}","milestones_url":"https://api.github.com/repos/Normation/rudder-packages/milestones{/number}","notifications_url":"https://api.github.com/repos/Normation/rudder-packages/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Normation/rudder-packages/labels{/name}","releases_url":"https://api.github.com/repos/Normation/rudder-packages/releases{/id}","created_at":"2011-10-06T19:30:49Z","updated_at":"2015-06-02T21:36:38Z","pushed_at":"2015-06-23T08:54:28Z","git_url":"git://github.com/Normation/rudder-packages.git","ssh_url":"git@github.com:Normation/rudder-packages.git","clone_url":"https://github.com/Normation/rudder-packages.git","svn_url":"https://github.com/Normation/rudder-packages","homepage":"http://www.rudder-project.org/","size":9004,"stargazers_count":4,"watchers_count":4,"language":"Shell","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":17,"mirror_url":null,"open_issues_count":7,"forks":17,"open_issues":7,"watchers":4,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Normation/rudder-packages/pulls/690"},"html":{"href":"https://github.com/Normation/rudder-packages/pull/690"},"issue":{"href":"https://api.github.com/repos/Normation/rudder-packages/issues/690"},"comments":{"href":"https://api.github.com/repos/Normation/rudder-packages/issues/690/comments"},"review_comments":{"href":"https://api.github.com/repos/Normation/rudder-packages/pulls/690/comments"},"review_comment":{"href":"https://api.github.com/repos/Normation/rudder-packages/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Normation/rudder-packages/pulls/690/commits"},"statuses":{"href":"https://api.github.com/repos/Normation/rudder-packages/statuses/5dca5fa3ad06cf2dd85dc8faada8d35a0da48fcc"}}}}